[Issue-1780] Update pagejs for new version

Koniverse · Sep 7, 2024 · 12a5ad2 · 12a5ad2
1 parent 781663e
commit 12a5ad2
Show file tree

Hide file tree

Showing 8 changed files with 6,897 additions and 54 deletions.
diff --git a/html/PageJs.bundle/page.js b/html/PageJs.bundle/page.js
diff --git a/package.json b/package.json
@@ -62,9 +62,9 @@
     "@subwallet/extension-chains": "1.2.28-0",
     "@subwallet/extension-dapp": "1.2.28-0",
     "@subwallet/extension-inject": "1.2.28-0",
-    "@subwallet/keyring": "0.1.5",
+    "@subwallet/keyring": "0.1.6",
     "@subwallet/react-ui": "^5.1.2-b77",
-    "@subwallet/ui-keyring": "^0.1.5",
+    "@subwallet/ui-keyring": "0.1.6",
     "@walletconnect/utils": "2.8.4",
     "deprecated-react-native-prop-types": "^4.0.0",
     "eventemitter3": "^5.0.0",

diff --git a/src/hooks/useConfirmations.ts b/src/hooks/useConfirmations.ts
@@ -21,7 +21,6 @@ import { toggleConfirmationDisplayState } from 'stores/updater';
 const ConfirmationsQueueItems = [
   'addNetworkRequest',
   'addTokenRequest',
-  'switchNetworkRequest',
   'evmSignatureRequest',
   'evmSignatureRequestExternal',
   'evmSendTransactionRequest',

diff --git a/src/screens/Confirmations/index.tsx b/src/screens/Confirmations/index.tsx
@@ -81,7 +81,6 @@ export const Confirmations = () => {
       evmSignatureRequest: i18n.header.signatureRequest,
       metadataRequest: i18n.header.updateMetadata,
       signingRequest: i18n.header.signatureRequest,
-      switchNetworkRequest: i18n.header.addNetworkRequest,
       connectWCRequest: i18n.header.walletConnect,
       errorConnectNetwork: i18n.header.transactionRequest,
     }),

diff --git a/src/screens/Confirmations/parts/Sign/Evm.tsx b/src/screens/Confirmations/parts/Sign/Evm.tsx
@@ -196,9 +196,9 @@ export const EvmSignArea = (props: Props) => {
           block={true}
           disabled={loading}
           icon={isErrorTransaction && getButtonIcon(XCircle)}
-          type={isErrorTransaction ? 'primary' : 'secondary'}
+          type={'secondary'}
           onPress={onCancel}>
-          {isErrorTransaction ? i18n.common.backToHome : i18n.common.cancel}
+          {isErrorTransaction ? i18n.buttonTitles.iUnderstand : i18n.common.cancel}
         </Button>
         {!isErrorTransaction && (
           <Button

diff --git a/src/screens/Confirmations/variants/Error/NetworkConnectionErrorConfirmation.tsx b/src/screens/Confirmations/variants/Error/NetworkConnectionErrorConfirmation.tsx
@@ -87,7 +87,7 @@ export const NetworkConnectionErrorConfirmation = ({ request, type }: Props) =>
           )}
 
           <Button disabled={loading} onPress={onCancel} type={'primary'}>
-            {i18n.buttonTitles.backToHome}
+            {i18n.buttonTitles.iUnderstand}
           </Button>
         </View>
       </ConfirmationFooter>

diff --git a/src/stores/base/RequestState.ts b/src/stores/base/RequestState.ts
@@ -23,7 +23,6 @@ const initialState: RequestState = {
   // Type of confirmation requets
   addNetworkRequest: {},
   addTokenRequest: {},
-  switchNetworkRequest: {},
   evmSignatureRequest: {},
   evmSendTransactionRequest: {},
   evmWatchTransactionRequest: {},
@@ -41,7 +40,6 @@ export const CONFIRMATIONS_FIELDS: Array<keyof RequestState> = [
   'signingRequest',
   'addNetworkRequest',
   'addTokenRequest',
-  'switchNetworkRequest',
   'evmSignatureRequest',
   'evmSendTransactionRequest',
   'errorConnectNetwork',

diff --git a/yarn.lock b/yarn.lock
@@ -5155,35 +5155,7 @@
     "@polkadot/x-global" "^12.2.1"
     web3-core "^1.10.0"
 
-"@subwallet/[email protected]":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@subwallet/keyring/-/keyring-0.1.5.tgz#64d6187829e924fdcbf6e3f811b12a9e485fc626"
-  integrity sha512-Rhka28m57kncyvSgwQZRYiSjcppqKb4v8vHEwIaHjdo1lu87yw3O9hvMeTv0GLFIU2xHMQaJ85Hkp8NLr/q7jw==
-  dependencies:
-    "@ethereumjs/tx" "^5.0.0"
-    "@polkadot/util" "^12.2.1"
-    "@polkadot/util-crypto" "^12.2.1"
-    bcryptjs "^2.4.3"
-    eth-simple-keyring "^4.2.0"
-    eventemitter3 "^4.0.7"
-    rxjs "^7.5.6"
-    tslib "^2.6.2"
-
-"@subwallet/keyring@^0.1.2":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@subwallet/keyring/-/keyring-0.1.3.tgz#c1340160a64800d5c02329cbd1ef6e0e69480214"
-  integrity sha512-ZhSpzdMz3SQ6nlK3NY7axcpx9RDXzHrhvFoVBGnzZQilR90OW/046UMZ78vyaF88S4HMY2kCb+/qLY6NOalUqg==
-  dependencies:
-    "@ethereumjs/tx" "^5.0.0"
-    "@polkadot/util" "^12.2.1"
-    "@polkadot/util-crypto" "^12.2.1"
-    bcryptjs "^2.4.3"
-    eth-simple-keyring "^4.2.0"
-    eventemitter3 "^4.0.7"
-    rxjs "^7.5.6"
-    tslib "^2.6.2"
-
-"@subwallet/keyring@^0.1.6":
+"@subwallet/[email protected]", "@subwallet/keyring@^0.1.6":
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/@subwallet/keyring/-/keyring-0.1.6.tgz#effaf6a584b9a500802c341e150568378c3565a0"
   integrity sha512-NcjPvsRSTmfIoSw3+MYXAPTIDj0SKeox5oiPojz90ESAfRyVzhxsA2Veiewwo6K/kd/ltj4xN8ayITQds3De0A==
@@ -5272,21 +5244,7 @@
     three "^0.151.2"
     throttle-debounce "^5.0.0"
 
-"@subwallet/ui-keyring@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@subwallet/ui-keyring/-/ui-keyring-0.1.5.tgz#daece9391a5bc32494a4ff21449d1e7038766451"
-  integrity sha512-eFhd+dVCnU1oPzBKmDx20KswWB8ojwz3tl+auiDOdRcKKaTlQQ/nK/RC+5WQbWX/KyB8rbdPbvD7MLlxUnT08w==
-  dependencies:
-    "@babel/runtime" "^7.20.1"
-    "@polkadot/ui-settings" "2.9.14"
-    "@polkadot/util" "^12.2.1"
-    "@polkadot/util-crypto" "^12.2.1"
-    "@subwallet/keyring" "^0.1.2"
-    mkdirp "^1.0.4"
-    rxjs "^7.5.7"
-    store "^2.0.12"
-
-"@subwallet/ui-keyring@^0.1.6":
+"@subwallet/[email protected]", "@subwallet/ui-keyring@^0.1.6":
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/@subwallet/ui-keyring/-/ui-keyring-0.1.6.tgz#35967fdba3242e2559e00b5e9c93472105c0229d"
   integrity sha512-XjNP5eqQ6YyWzlfA+0NXfyi9ykLIXzddk4IjsjuLro4Jys3hHMCd2e99aBKJMQ2Rk8Hsi/gLnE8SOc9Mr7jVTQ==