Merge pull request #559 from syscoin/develop

v2.0.17
syscoin · Apr 10, 2024 · 75a31af · 75a31af
2 parents 479240d + d55501b
commit 75a31af
Show file tree

Hide file tree

Showing 28 changed files with 555 additions and 444 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Pali Wallet",
-  "version": "2.0.15",
+  "version": "2.0.17",
   "icons": {
     "16": "assets/icons/favicon-16.png",
     "32": "assets/icons/favicon-32.png",
@@ -91,4 +91,4 @@
       }
     }
   }
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paliwallet",
-  "version": "2.0.15",
+  "version": "2.0.17",
   "description": "A Non-Custodial Crypto Wallet",
   "private": true,
   "repository": {
@@ -48,7 +48,7 @@
     "@babel/runtime": "^7.21.5",
     "@headlessui/react": "^1.6.0",
     "@heroicons/react": "^1.0.5",
-    "@pollum-io/sysweb3-keyring": "^1.0.478",
+    "@pollum-io/sysweb3-keyring": "^1.0.479",
     "@pollum-io/sysweb3-network": "^1.0.95",
     "@pollum-io/sysweb3-utils": "^1.1.232",
     "@reduxjs/toolkit": "^1.4.0",

diff --git a/palette.js b/palette.js
@@ -108,11 +108,6 @@ module.exports = {
     whiteAlpha300: 'rgba(255, 255, 255, 0.16)',
   },
 
-  alpha: {
-    whiteAlpha300: 'rgba(255, 255, 255, 0.16)',
-    whiteAlpha200: 'rgba(255, 255, 255, 0.08)',
-  },
-
   extraColors: {
     red: '#D70000',
   },

diff --git a/source/assets/icons/hardwallet.svg b/source/assets/icons/hardwallet.svg
diff --git a/source/assets/locales/en.json b/source/assets/locales/en.json
@@ -164,7 +164,8 @@
   "titles": {
     "assetDetails": "ASSET DETAILS",
     "transactionDetails": "TRANSACTION DETAILS",
-    "importWallet": "Import wallet"
+    "importWallet": "Import wallet",
+    "congratulations": "CONGRATULATIONS!"
   },
   "import": {
     "importingYourAccount": "Importing your wallet seed automatically import a wallet associated with this seed phrase.",
@@ -313,12 +314,14 @@
     "permissions": "Permissions",
     "viewTheAddresses": "View the addresses of your permitted accounts",
     "errorCreatingHardWallet": "Error creating hardware wallet.",
-    "hardwareWallet": "HARDWARE WALLET",
-    "selectTheHardware": "Select the hardware wallet you'd like",
+    "hardwareWallet": "CONNECT HARDWALLET",
+    "selectTheHardware": "SELECT HARDWALLET:",
     "toConnect": "to connect",
     "toAddAccount": "to add account",
     "toPali": "to Pali",
     "dontHaveWallet": "Don't have a hardware wallet?",
+    "connectYourWalletAndClick": "CONNECT YOUR {{hardwalletName}} AND CLICK TO CONNECT!",
+    "youCanUseAny": "You can use any {{hardwalletName}} device.",
     "orderTrezor": "Order a Trezor wallet and keep your funds in cold storage.",
     "orderLedger": "Order a Ledger wallet and keep your funds in cold storage.",
     "buyNow": "Buy now",

diff --git a/source/assets/locales/es.json b/source/assets/locales/es.json
@@ -164,7 +164,8 @@
   "titles": {
     "assetDetails": "DETALLES DEL ACTIVO",
     "transactionDetails": "DETALLES DE LA TRANSACCIÓN",
-    "importWallet": "Importar billetera"
+    "importWallet": "Importar billetera",
+    "congratulations": "FELICIDADES!"
   },
   "import": {
     "importingYourAccount": "Importar tu frase semilla de billetera automáticamente importará una billetera asociada a esta frase semilla.",
@@ -315,12 +316,14 @@
     "addNewChain": "Agregar Nueva Cadena",
     "viewTheAddresses": "Ver las direcciones de tus cuentas permitidas",
     "errorCreatingHardWallet": "Error al crear monedero hardware.",
-    "hardwareWallet": "MONEDERO HARDWARE",
-    "selectTheHardware": "Selecciona el monedero hardware que desees",
+    "hardwareWallet": "CONECTAR HARDWALLET",
+    "selectTheHardware": "SELECCIONAR HARDWALLET:",
     "toConnect": "conectar",
     "toAddAccount": "para agregar una cuenta",
     "toPali": "a Pali",
     "dontHaveWallet": "¿No tienes un monedero hardware?",
+    "connectYourWalletAndClick": "CONECTA TU MONEDERO {{hardwalletName}} Y HAZ CLIC PARA CONECTAR",
+    "youCanUseAny": "Puedes usar cualquier dispositivo {{hardwalletName}}.",
     "orderTrezor": "Ordena un monedero Trezor y guarda tus fondos en almacenamiento en frío.",
     "orderLedger": "Ordena un monedero Ledger y guarda tus fondos en almacenamiento en frío.",
     "buyNow": "Comprar ahora",

diff --git a/source/assets/locales/pt-br.json b/source/assets/locales/pt-br.json
@@ -289,7 +289,9 @@
     "allYourSettings": "All your settings, like custom tokens and imported accounts, will get lost, however, your funds it’s saved!",
     "setAutoLockTime": "Configurar tempo de bloqueio automático",
     "defaultMinutes": "Padrão: 5 minutos após inatividade.",
-    "maximumMinutes": "Máximo: 120 minutos."
+    "maximumMinutes": "Máximo: 120 minutos.",
+    "connectYourWalletAndClick": "CONECTE SUA {{hardwalletName}} E CLIQUE PARA CONECTAR!",
+    "youCanUseAny": "Você pode usar qualquer dispositivo {{hardwalletName}}."
   },
   "start": {
     "getStarted": "Get started",
@@ -379,5 +381,11 @@
   "walletSeedPhrasePage": {
     "keepSeedPhrase": "Mantenha sua seed em segredo!",
     "anyoneWithThisInfo": "Qualquer pessoa com estas informações pode roubar seus fundos."
+  },
+  "titles": {
+    "assetDetails": "DETALLES DEL ACTIVO",
+    "transactionDetails": "DETALLES DE LA TRANSACCIÓN",
+    "importWallet": "Importar billetera",
+    "congratulations": "PARABÉNS!"
   }
 }
diff --git a/source/assets/styles/custom-input-normal.css b/source/assets/styles/custom-input-normal.css
@@ -27,8 +27,8 @@
   font-weight: 400;
   line-height: normal;
   color: #fff;
-  top: 55%;
-  right: 40px;
+  top: 52%;
+  right: 23px;
   transform: translateY(-50%);
 }
 
@@ -42,7 +42,16 @@
   font-weight: 400;
   line-height: normal;
   color: #fff;
-  top: 55%;
-  right: 40px;
+  top: 51%;
+  right: 23px;
   transform: translateY(-50%);
 }
+
+.custom-input-normal .ant-input-suffix .anticon-loading {
+  position: absolute;
+  top: 35%;
+  right: 28px;
+  cursor: pointer;
+  font-size: 14px;
+  line-height: 14px;
+}
diff --git a/source/components/Modal/WarningBaseModal.tsx b/source/components/Modal/WarningBaseModal.tsx
@@ -322,3 +322,35 @@ export const CreatedAccountSuccessfully = ({
     </ModalBase>
   );
 };
+
+export const RPCSuccessfullyAdded = ({
+  phraseOne,
+  onClose,
+  show = true,
+  title,
+}: IDefaultModal) => {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+
+  return (
+    <ModalBase onClose={onClose} show={show}>
+      <div className="rounded-t-[50px] w-screen flex flex-col align-bottom justify-end items-center bg-brand-blue400 shadow-md">
+        <div className="bg-[#476daa] w-full py-5 rounded-t-[50px]">
+          <h1 className="text-white font-medium text-base">{title}</h1>
+        </div>
+        <div className="flex flex-col pt-6 pb-7 px-6 text-white text-left text-sm font-normal w-[94%]">
+          <p>{phraseOne}</p>
+        </div>
+
+        <Button
+          id="btn-ok"
+          type="submit"
+          className="bg-white w-[22rem] h-10 text-brand-blue200 text-base mb-12 font-base font-medium rounded-2xl"
+          onClick={() => navigate('/settings/networks/edit')}
+        >
+          {t('buttons.ok')}
+        </Button>
+      </div>
+    </ModalBase>
+  );
+};
diff --git a/source/components/TransactionOptions/TransactionOptions.tsx b/source/components/TransactionOptions/TransactionOptions.tsx
@@ -1,5 +1,5 @@
 import { Menu, Transition } from '@headlessui/react';
-import React from 'react';
+import React, { useCallback } from 'react';
 import { Fragment } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -19,6 +19,7 @@ export const TransactionOptions: React.FC<ITransactionOptions> = ({
 }) => {
   const isLegacyTransaction =
     transaction.type === 0 || String(transaction.type) === '0x0';
+
   const { t } = useTranslation();
   const { navigate } = useUtils();
 
@@ -70,6 +71,16 @@ export const TransactionOptions: React.FC<ITransactionOptions> = ({
         break;
     }
   };
+
+  const handleGoTxDetails = useCallback(() => {
+    navigate('/home/details', {
+      state: {
+        id: null,
+        hash: transaction.hash,
+      },
+    });
+  }, [transaction.hash]);
+
   return (
     <>
       <Menu
@@ -80,12 +91,10 @@ export const TransactionOptions: React.FC<ITransactionOptions> = ({
         <Menu.Button
           className="inline-flex justify-center w-full 
       hover:text-button-primaryhover text-white text-sm font-medium 
-      hover:bg-opacity-30 rounded-full focus:outline-none 
-      focus-visible:ring-2 focus-visible:ring-white 
-      focus-visible:ring-opacity-75"
+      hover:bg-opacity-30 rounded-full"
         >
           <IconButton className="w-5">
-            <Icon isSvg={true} name="EditTx" className="text-base" />
+            <Icon isSvg name="EditTx" className="text-base" />
           </IconButton>
         </Menu.Button>
 
@@ -98,87 +107,82 @@ export const TransactionOptions: React.FC<ITransactionOptions> = ({
           leaveFrom="transform opacity-100 scale-100"
           leaveTo="transform opacity-0 scale-95"
         >
-          <Menu.Items
-            as="div"
-            className="p-6 absolute right-0 z-10 w-[23rem] origin-top-right rounded-lg bg-brand-blue500 shadow-2xl ring-1 
+          <div className="absolute right-0 z-10 h-[15rem]">
+            <Menu.Items
+              as="div"
+              className="p-6 absolute right-0 z-10 w-[23rem] origin-top-right rounded-lg bg-brand-blue500 shadow-2xl ring-1 
             font-poppins ring-black ring-opacity-5 focus:outline-none transition-all duration-300 ease-in-out cursor-pointer"
-          >
-            <h1 className="text-sm font-semibold text-brand-gray200 pb-4">
-              PENDING TRANSACTION
-            </h1>
-            <Menu.Item>
-              {({ active }) => (
-                <li
-                  className={`
+            >
+              <h1 className="text-sm font-semibold text-brand-gray200 pb-4">
+                PENDING TRANSACTION
+              </h1>
+              <Menu.Item>
+                {({ active }) => (
+                  <li
+                    className={`
                   ${active ? 'font-semibold' : 'font-normal'}
                   flex items-center justify-start text-brand-white mb-4 w-full
                   `}
-                  onClick={() =>
-                    navigate('/home/details', {
-                      state: {
-                        id: null,
-                        hash: transaction.hash,
-                      },
-                    })
-                  }
-                >
-                  <IconButton className="w-5 mr-3">
-                    <Icon
-                      name="externalLink"
-                      isSvg={true}
-                      className="text-base text-brand-white"
-                    />
-                  </IconButton>
-                  <span className="text-sm text-brand-white">
-                    See on the block explorer
-                  </span>
-                </li>
-              )}
-            </Menu.Item>
-            <Menu.Item>
-              {({ active }) => (
-                <li
-                  className={`
+                    onClick={handleGoTxDetails}
+                  >
+                    <IconButton className="w-5 mr-3">
+                      <Icon
+                        name="externalLink"
+                        isSvg
+                        className="text-base text-brand-white"
+                      />
+                    </IconButton>
+                    <span className="text-sm text-brand-white">
+                      See on the block explorer
+                    </span>
+                  </li>
+                )}
+              </Menu.Item>
+              <Menu.Item>
+                {({ active }) => (
+                  <li
+                    className={`
                   ${active ? 'font-semibold' : 'font-normal'}
                   flex items-center justify-start text-brand-white mb-4 w-full
                   `}
-                  onClick={() => handleOnClick(UpdateTxAction.SpeedUp)}
-                >
-                  <IconButton className="w-5 mr-3">
-                    <Icon
-                      name="SpeedUp"
-                      isSvg={true}
-                      className="text-base text-brand-white"
-                    />
-                  </IconButton>
-                  <span className="text-sm text-brand-white">
-                    {t('header.speedUp')}
-                  </span>
-                </li>
-              )}
-            </Menu.Item>
-            <Menu.Item>
-              {({ active }) => (
-                <li
-                  className={`
+                    onClick={() => handleOnClick(UpdateTxAction.SpeedUp)}
+                  >
+                    <IconButton className="w-5 mr-3">
+                      <Icon
+                        name="SpeedUp"
+                        isSvg
+                        className="text-base text-brand-white"
+                      />
+                    </IconButton>
+                    <span className="text-sm text-brand-white">
+                      {t('header.speedUp')}
+                    </span>
+                  </li>
+                )}
+              </Menu.Item>
+              <Menu.Item>
+                {({ active }) => (
+                  <li
+                    className={`
                 ${active ? 'font-semibold ' : 'font-normal'}
                 flex items-center justify-start w-full `}
-                  onClick={() => handleOnClick(UpdateTxAction.Cancel)}
-                >
-                  <IconButton className="w-5 mr-3">
-                    <Icon
-                      name="Trash"
-                      isSvg={true}
-                      className="text-base text-brand-white"
-                    />
-                  </IconButton>
-                  <span className="text-sm text-brand-white">
-                    {t('buttons.cancel')}
-                  </span>
-                </li>
-              )}
-            </Menu.Item>
-          </Menu.Items>
+                    onClick={() => handleOnClick(UpdateTxAction.Cancel)}
+                  >
+                    <IconButton className="w-5 mr-3">
+                      <Icon
+                        name="Trash"
+                        isSvg
+                        className="text-base text-brand-white"
+                      />
+                    </IconButton>
+                    <span className="text-sm text-brand-white">
+                      {t('buttons.cancel')}
+                    </span>
+                  </li>
+                )}
+              </Menu.Item>
+            </Menu.Items>
+          </div>
         </Transition>
       </Menu>
     </>