Merge remote-tracking branch 'origin/subwallet-dev'

package.json

@@ -105,7 +105,7 @@
     "@polkadot/types-support": "^12.0.2",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
-    "@subwallet/chain-list": "0.2.92",
+    "@subwallet/chain-list": "0.2.93",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/react-ui": "5.1.2-b79",
     "@subwallet/ui-keyring": "0.1.8-beta.0",

packages/extension-base/package.json

@@ -55,7 +55,7 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.92",
+    "@subwallet/chain-list": "0.2.93",
     "@subwallet/extension-base": "^1.3.5-0",
     "@subwallet/extension-chains": "^1.3.5-0",
     "@subwallet/extension-dapp": "^1.3.5-0",

packages/extension-base/src/services/transaction-service/utils.ts

@@ -39,6 +39,10 @@ function getBlockExplorerAccountRoute (explorerLink: string) {
     return '#/accounts';
   }
 
+  if (explorerLink.includes('tangle.statescan.io')) {
+    return '#/accounts';
+  }
+
   if (explorerLink.includes('explorer.zkverify.io')) {
     return 'account';
   }

packages/extension-koni-ui/package.json

@@ -34,7 +34,7 @@
     "@polkadot/util-crypto": "^12.6.2",
     "@ramonak/react-progress-bar": "^5.0.3",
     "@reduxjs/toolkit": "^1.9.1",
-    "@subwallet/chain-list": "0.2.92",
+    "@subwallet/chain-list": "0.2.93",
     "@subwallet/extension-base": "^1.3.5-0",
     "@subwallet/extension-chains": "^1.3.5-0",
     "@subwallet/extension-dapp": "^1.3.5-0",

packages/extension-koni-ui/src/components/Field/Earning/EarningPoolSelector.tsx

@@ -50,7 +50,10 @@ const SORTING_MODAL_ID = 'pool-sorting-modal';
 const FILTER_MODAL_ID = 'pool-filter-modal';
 
 const Component = (props: Props, ref: ForwardedRef<InputRef>) => {
-  const { chain, className = '', defaultValue, disabled,
+  const { chain,
+    className = '',
+    defaultValue: cachedValue,
+    disabled,
     from,
     id = 'pool-selector',
     label, loading, onChange,
@@ -127,7 +130,17 @@ const Component = (props: Props, ref: ForwardedRef<InputRef>) => {
     return compound?.nominations.map((item) => item.validatorAddress) || [];
   }, [compound?.nominations]);
 
-  const defaultSelectPool = defaultPoolMap?.[chain];
+  const stakedPool = useMemo(() => nominationPoolValueList[0], [nominationPoolValueList]);
+
+  const recommendPool = useMemo(() => {
+    const recommendPools: number[] = defaultPoolMap?.[chain] || [];
+
+    if (recommendPools.length) {
+      return recommendPools[0].toString();
+    } else {
+      return '';
+    }
+  }, [defaultPoolMap, chain]);
 
   const resultList = useMemo((): NominationPoolDataType[] => {
     const recommendedSessionHeader: NominationPoolDataType = { address: '', bondedAmount: '', decimals: 0, id: -1, idStr: '-1', isProfitable: false, memberCounter: 0, roles: { bouncer: '', depositor: '', nominator: '', root: '' }, state: 'Open', symbol: '', name: 'Recommended', isSessionHeader: true, disabled: true };
@@ -364,11 +377,11 @@ const Component = (props: Props, ref: ForwardedRef<InputRef>) => {
   }, []);
 
   useEffect(() => {
-    const defaultSelectedPool = defaultValue || nominationPoolValueList[0] || `${defaultSelectPool?.[0] || ''}`;
+    const defaultSelectedPool = stakedPool || value || cachedValue || recommendPool;
 
     onChange && onChange({ target: { value: defaultSelectedPool } });
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [nominationPoolValueList, items]);
+  }, [stakedPool, recommendPool, items]);
 
   useEffect(() => {
     if (!isActive) {

packages/extension-web-ui/package.json

@@ -35,7 +35,7 @@
     "@polkadot/util-crypto": "^12.6.2",
     "@ramonak/react-progress-bar": "^5.0.3",
     "@reduxjs/toolkit": "^1.9.1",
-    "@subwallet/chain-list": "0.2.92",
+    "@subwallet/chain-list": "0.2.93",
     "@subwallet/extension-base": "^1.3.5-0",
     "@subwallet/extension-chains": "^1.3.5-0",
     "@subwallet/extension-dapp": "^1.3.5-0",

yarn.lock

@@ -6265,14 +6265,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@subwallet/chain-list@npm:0.2.92":
-  version: 0.2.92
-  resolution: "@subwallet/chain-list@npm:0.2.92"
+"@subwallet/chain-list@npm:0.2.93":
+  version: 0.2.93
+  resolution: "@subwallet/chain-list@npm:0.2.93"
   dependencies:
     "@polkadot/dev": 0.67.167
     "@polkadot/util": ^12.5.1
     eventemitter3: ^5.0.1
-  checksum: 358078ca2948031004ba5f62b1aa870e8ac5189f51beafafdfefa0091858e10b4c52a8987be49a5445b63fd969f13bb7b572f4fdfb43fa45076514b8f7fbdb18
+  checksum: e618b88b667858336291f487747a4cfd8c718af3b6dda369c316f511d18e2e64297441aed7a1f48b3eb2381685898471109519a7bc6916ef2179500805dfe588
   languageName: node
   linkType: hard
 
@@ -6315,7 +6315,7 @@ __metadata:
     "@reduxjs/toolkit": ^1.9.1
     "@sora-substrate/type-definitions": ^1.17.7
     "@substrate/connect": ^0.8.9
-    "@subwallet/chain-list": 0.2.92
+    "@subwallet/chain-list": 0.2.93
     "@subwallet/extension-base": ^1.3.5-0
     "@subwallet/extension-chains": ^1.3.5-0
     "@subwallet/extension-dapp": ^1.3.5-0
@@ -6453,7 +6453,7 @@ __metadata:
     "@polkadot/util-crypto": ^12.6.2
     "@ramonak/react-progress-bar": ^5.0.3
     "@reduxjs/toolkit": ^1.9.1
-    "@subwallet/chain-list": 0.2.92
+    "@subwallet/chain-list": 0.2.93
     "@subwallet/extension-base": ^1.3.5-0
     "@subwallet/extension-chains": ^1.3.5-0
     "@subwallet/extension-dapp": ^1.3.5-0
@@ -6593,7 +6593,7 @@ __metadata:
     "@polkadot/util-crypto": ^12.6.2
     "@ramonak/react-progress-bar": ^5.0.3
     "@reduxjs/toolkit": ^1.9.1
-    "@subwallet/chain-list": 0.2.92
+    "@subwallet/chain-list": 0.2.93
     "@subwallet/extension-base": ^1.3.5-0
     "@subwallet/extension-chains": ^1.3.5-0
     "@subwallet/extension-dapp": ^1.3.5-0