Koniverse · Quangdm-cdm · Jan 7, 2025 · Jan 7, 2025 · Jan 8, 2025 · Jan 9, 2025
diff --git a/html/DevModeWeb.bundle/site/index.html b/html/DevModeWeb.bundle/site/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-7e39a642b200fcd7f0d8.js"></script></head><body><div id="root">SubWallet</div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-a04d239a3ee82e81aa2c.js"></script></head><body><div id="root">SubWallet</div></body></html>
diff --git a/...e/site/web-runner-7e39a642b200fcd7f0d8.js → ...e/site/web-runner-a04d239a3ee82e81aa2c.js b/...e/site/web-runner-7e39a642b200fcd7f0d8.js → ...e/site/web-runner-a04d239a3ee82e81aa2c.js
diff --git a/html/Web.bundle/site/index.html b/html/Web.bundle/site/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-ae28e0063e546f407fa5.js"></script></head><body><div id="root">SubWallet</div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-da47ab101888489727c6.js"></script></head><body><div id="root">SubWallet</div></body></html>
diff --git a/...e/site/web-runner-ae28e0063e546f407fa5.js → ...e/site/web-runner-da47ab101888489727c6.js b/...e/site/web-runner-ae28e0063e546f407fa5.js → ...e/site/web-runner-da47ab101888489727c6.js
diff --git a/package.json b/package.json
@@ -218,7 +218,7 @@
     "@polkadot/api": "^12.0.2",
     "@polkadot/util-crypto": "^12.6.2",
     "@polkadot/types": "^12.0.2",
-    "@subwallet/chain-list": "0.2.88-beta.6",
+    "@subwallet/chain-list": "0.2.97",
     "@subwallet/extension-base": "1.3.2-0",
     "react-native-svg": "^13.6.0",
     "sails-js": "0.1.6",

diff --git a/src/App.tsx b/src/App.tsx
@@ -35,7 +35,6 @@ import { Warning } from 'phosphor-react-native';
 import { Images } from 'assets/index';
 import Text from 'components/Text';
 import i18n from 'utils/i18n/i18n';
-import { useGetEarningPoolData } from 'hooks/static-content/useGetEarningPoolData';
 import { AppOnlineContentContextProvider } from 'providers/AppOnlineContentProvider';
 import { GlobalModalContextProvider } from 'providers/GlobalModalContext';
 import { useGetAppInstructionData } from 'hooks/static-content/useGetAppInstructionData';
@@ -172,7 +171,6 @@ export const App = () => {
   const isI18nReady = useSetupI18n().isI18nReady;
   const { checkIsShowBuyToken } = useShowBuyToken();
   const { getDAppsData } = useGetDAppList();
-  const { getPoolInfoMap } = useGetEarningPoolData();
   const { getConfig } = useGetConfig();
   const { getBrowserConfig } = useGetBrowserConfig();
   const { getAppInstructionData } = useGetAppInstructionData(language); // data for app instruction, will replace getEarningStaticData
@@ -214,7 +212,8 @@ export const App = () => {
       SplashScreen.hide();
     }, 100);
     checkIsShowBuyToken();
-    getPoolInfoMap();
+    // getPoolInfoMap();
+    mmkvStore.delete('poolInfoMap'); // remove unused mmkvStore
     getDAppsData();
     getConfig();
     getBrowserConfig();

diff --git a/src/components/Modal/common/AccountSelector.tsx b/src/components/Modal/common/AccountSelector.tsx
@@ -145,6 +145,16 @@ export const AccountSelector = ({
     return { groupBy, sortSection: undefined, renderSectionHeader };
   }, [groupBy, renderSectionHeader]);
 
+  const searchFunc = useCallback((_items: AccountAddressItemExtraType[], searchString: string) => {
+    const lowerCaseSearchString = searchString.toLowerCase();
+
+    return _items.filter(
+      acc =>
+        (acc.accountName && acc.accountName.toLowerCase().includes(lowerCaseSearchString)) ||
+        acc.address.toLowerCase().includes(lowerCaseSearchString),
+    );
+  }, []);
+
   return (
     <FullSizeSelectModal
       items={listItems}
@@ -153,6 +163,7 @@ export const AccountSelector = ({
       selectModalType={'single'}
       selectModalItemType={'account'}
       disabled={disabled}
+      searchFunc={searchFunc}
       renderSelected={renderSelected}
       placeholder={i18n.placeholder.accountName}
       title={i18n.header.selectAccount}

diff --git a/src/components/Modal/common/AccountSelectorNew.tsx b/src/components/Modal/common/AccountSelectorNew.tsx
@@ -139,13 +139,26 @@ export const AccountProxySelector = ({
     onSelectItem && onSelectItem(item);
   };
 
+  const searchFunc = useCallback((_items: AccountProxyItem[], searchString: string) => {
+    const lowerCaseSearchString = searchString.toLowerCase();
+
+    return _items.filter(acc => {
+      const isValidSearchByAddress = acc.accounts.some(ac => {
+        return ac.address.toLowerCase().includes(searchString.toLowerCase());
+      });
+
+      return (acc.name && acc.name.toLowerCase().includes(lowerCaseSearchString)) || isValidSearchByAddress;
+    });
+  }, []);
+
   return (
     <FullSizeSelectModal
       items={listItems}
       selectedValueMap={selectedValueMap}
       onSelectItem={_onSelectItem}
       selectModalType={'single'}
       selectModalItemType={'account-proxy'}
+      searchFunc={searchFunc}
       disabled={disabled}
       renderSelected={renderSelected}
       placeholder={i18n.placeholder.accountName}

diff --git a/src/components/Modal/common/ChainSelector.tsx b/src/components/Modal/common/ChainSelector.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import i18n from 'utils/i18n/i18n';
 import { ChainInfo } from 'types/index';
 import { FullSizeSelectModal } from 'components/common/SelectModal';
@@ -23,12 +23,19 @@ export const ChainSelector = ({
   acceptDefaultValue,
   chainSelectorRef,
 }: Props) => {
+  const searchFunc = useCallback((_items: ChainInfo[], searchString: string) => {
+    const lowerCaseSearchString = searchString.toLowerCase();
+
+    return _items.filter(({ name }) => name.toLowerCase().includes(lowerCaseSearchString));
+  }, []);
+
   return (
     <FullSizeSelectModal
       items={items}
       selectedValueMap={selectedValueMap}
       selectModalType={'single'}
       selectModalItemType={'chain'}
+      searchFunc={searchFunc}
       onSelectItem={onSelectItem}
       renderSelected={renderSelected}
       disabled={disabled}

diff --git a/src/components/Modal/common/TokenSelector.tsx b/src/components/Modal/common/TokenSelector.tsx
@@ -8,6 +8,8 @@ import { MagnifyingGlass } from 'phosphor-react-native';
 import { useNavigation } from '@react-navigation/native';
 import { RootNavigationProps } from 'routes/index';
 import { ListRenderItemInfo } from '@shopify/flash-list';
+import { useSelector } from 'react-redux';
+import { RootState } from 'stores/index';
 
 export type TokenItemType = {
   name: string;
@@ -58,6 +60,7 @@ export const TokenSelector = ({
   onCloseAccountSelector,
   showAddBtn = true,
 }: Props) => {
+  const chainInfoMap = useSelector((root: RootState) => root.chainStore.chainInfoMap);
   const navigation = useNavigation<RootNavigationProps>();
   useEffect(() => {
     setAdjustPan();
@@ -87,12 +90,26 @@ export const TokenSelector = ({
     );
   }, [navigation, onCloseAccountSelector, showAddBtn, tokenSelectorRef]);
 
+  const searchFunc = useCallback(
+    (_items: TokenItemType[], searchString: string) => {
+      const lowerCaseSearchString = searchString.toLowerCase();
+
+      return (_items as TokenItemType[]).filter(
+        ({ symbol, originChain }) =>
+          symbol.toLowerCase().includes(lowerCaseSearchString) ||
+          chainInfoMap[originChain]?.name?.toLowerCase().includes(lowerCaseSearchString),
+      );
+    },
+    [chainInfoMap],
+  );
+
   return (
     <FullSizeSelectModal
       items={items}
       selectedValueMap={selectedValueMap}
       selectModalType={'single'}
       selectModalItemType={'token'}
+      searchFunc={searchFunc}
       title={i18n.header.selectToken}
       onSelectItem={_onSelectItem}
       ref={tokenSelectorRef}

diff --git a/src/components/Modal/common/TokenSelectorNew.tsx b/src/components/Modal/common/TokenSelectorNew.tsx
@@ -1,7 +1,9 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import { ListRenderItemInfo } from 'react-native';
 import i18n from 'utils/i18n/i18n';
 import { FullSizeSelectModal } from 'components/common/SelectModal';
+import { useSelector } from 'react-redux';
+import { RootState } from 'stores/index';
 
 export type TokenItemType = {
   name: string;
@@ -41,12 +43,28 @@ export const TokenSelector = ({
   defaultValue,
   acceptDefaultValue,
 }: Props) => {
+  const chainInfoMap = useSelector((root: RootState) => root.chainStore.chainInfoMap);
+
+  const searchFunc = useCallback(
+    (_items: TokenItemType[], searchString: string) => {
+      const lowerCaseSearchString = searchString.toLowerCase();
+
+      return (_items as TokenItemType[]).filter(
+        ({ symbol, originChain }) =>
+          symbol.toLowerCase().includes(lowerCaseSearchString) ||
+          chainInfoMap[originChain]?.name?.toLowerCase().includes(lowerCaseSearchString),
+      );
+    },
+    [chainInfoMap],
+  );
+
   return (
     <FullSizeSelectModal
       items={items}
       selectedValueMap={selectedValueMap}
       selectModalType={'single'}
       selectModalItemType={'token'}
+      searchFunc={searchFunc}
       title={i18n.header.selectToken}
       onSelectItem={onSelectItem}
       ref={tokenSelectorRef}

diff --git a/src/components/SeedPhraseArea.tsx b/src/components/SeedPhraseArea.tsx
@@ -14,6 +14,10 @@ interface SeedPhraseAreaProps extends ViewProps {
   currentWords: SelectedWordType[];
 }
 
+export function getWordKey(word: string, index: number, rowIndex: number) {
+  return `${index}-${word}-${rowIndex}`;
+}
+
 function getWrapperStyle(style: StyleProp<any> = {}): StyleProp<any> {
   return {
     borderRadius: 5,

diff --git a/src/components/common/Account/AccountCreationArea/index.tsx b/src/components/common/Account/AccountCreationArea/index.tsx
@@ -51,7 +51,7 @@ export const AccountCreationArea = ({ createAccountRef, importAccountRef, attach
       key: 'privateKey',
       backgroundColor: '#4D4D4D',
       icon: Wallet,
-      label: i18n.importAccount.importByMetaMaskPrivateKey,
+      label: i18n.importAccount.importFromPrivateKey,
     },
     {
       key: 'qrCode',

diff --git a/src/components/common/Modal/ConfirmModal/index.tsx b/src/components/common/Modal/ConfirmModal/index.tsx
@@ -58,7 +58,7 @@ const ConfirmModal: React.FC<Props> = ({
               {cancelBtnTitle || i18n.common.cancel}
             </Button>
             <Button
-              externalTextStyle={{ flex: 1, textAlign: 'center' }}
+              externalTextStyle={{ flexShrink: 1 }}
               style={{ flex: 1 }}
               icon={<Icon phosphorIcon={CheckCircle} size={'lg'} weight={'fill'} />}
               type="primary"

diff --git a/src/components/common/SelectAccountAllItem/index.tsx b/src/components/common/SelectAccountAllItem/index.tsx
@@ -32,7 +32,7 @@ export const SelectAccountAllItem = ({ isSelected, accountProxies, showUnSelecte
           <View style={styles.checkedIconWrapper}>
             <Icon
               phosphorIcon={CheckCircle}
-              iconColor={isSelected ? theme.colorSuccess : theme.colorTextLight4}
+              iconColor={isSelected ? theme.colorSuccess : theme['gray-5']}
               size={'sm'}
               weight={'fill'}
             />

diff --git a/src/components/common/SelectModal/index.tsx b/src/components/common/SelectModal/index.tsx
@@ -12,8 +12,6 @@ import { SelectModalField } from 'components/common/SelectModal/parts/SelectModa
 import { EmptyList } from 'components/EmptyList';
 import i18n from 'utils/i18n/i18n';
 import { TokenItemType } from 'components/Modal/common/TokenSelector';
-import { useSelector } from 'react-redux';
-import { RootState } from 'stores/index';
 import { ChainInfo } from 'types/index';
 import { useSubWalletTheme } from 'hooks/useSubWalletTheme';
 import { SWModalRefProps } from 'components/design-system-ui/modal/ModalBaseV2';
@@ -123,7 +121,6 @@ function _SelectModal<T>(selectModalProps: Props<T>, ref: ForwardedRef<any>) {
     keyExtractor,
     flatListStyle,
   } = selectModalProps;
-  const chainInfoMap = useSelector((root: RootState) => root.chainStore.chainInfoMap);
   const [isOpen, setOpen] = useState<boolean>(false);
   const [isLoadingData, setLoadingData] = useState<boolean>(true);
   const modalBaseV2Ref = useRef<SWModalRefProps>(null);
@@ -199,38 +196,6 @@ function _SelectModal<T>(selectModalProps: Props<T>, ref: ForwardedRef<any>) {
     [isOpen, onCloseModal, onModalOpened],
   );
 
-  const _searchFunction = useCallback(
-    (_items: T[], searchString: string): T[] => {
-      const lowerCaseSearchString = searchString.toLowerCase();
-
-      if (selectModalItemType === 'account') {
-        return (_items as AccountAddressItemExtraType[]).filter(
-          acc =>
-            (acc.accountName && acc.accountName.toLowerCase().includes(lowerCaseSearchString)) ||
-            acc.address.toLowerCase().includes(lowerCaseSearchString),
-        ) as T[];
-      } else if (selectModalItemType === 'account-proxy') {
-        return (_items as AccountProxyItem[]).filter(acc => {
-          const isValidSearchByAddress = acc.accounts.some(ac => {
-            return ac.address.toLowerCase().includes(searchString.toLowerCase());
-          });
-          return (acc.name && acc.name.toLowerCase().includes(lowerCaseSearchString)) || isValidSearchByAddress;
-        }) as T[];
-      } else if (selectModalItemType === 'token') {
-        return (_items as TokenItemType[]).filter(
-          ({ symbol, originChain }) =>
-            symbol.toLowerCase().includes(lowerCaseSearchString) ||
-            chainInfoMap[originChain]?.name?.toLowerCase().includes(lowerCaseSearchString),
-        ) as T[];
-      } else if (selectModalItemType === 'chain') {
-        return (items as ChainInfo[]).filter(({ name }) => name.toLowerCase().includes(lowerCaseSearchString)) as T[];
-      } else {
-        return items;
-      }
-    },
-    [chainInfoMap, items, selectModalItemType],
-  );
-
   const renderItem = ({ item }: ListRenderItemInfo<T>) => {
     if (selectModalItemType === 'account') {
       return (
@@ -353,35 +318,37 @@ function _SelectModal<T>(selectModalProps: Props<T>, ref: ForwardedRef<any>) {
           setVisible={setOpen}
           onBackButtonPress={onBackButtonPress}>
           <>
-            <FlatListScreen
-              autoFocus={true}
-              items={items}
-              style={{ flex: 1 }}
-              flatListStyle={flatListStyle}
-              renderItem={renderCustomItem || renderItem}
-              searchFunction={searchFunc || _searchFunction}
-              renderListEmptyComponent={renderListEmptyComponent || _renderListEmptyComponent}
-              title={title}
-              onPressBack={onCloseModal}
-              isLoadingData={isLoadingData}
-              isShowFilterBtn={isShowFilterBtn}
-              filterFunction={filterFunction}
-              filterOptions={filterOptions}
-              placeholder={placeholder}
-              loading={loading}
-              withSearchInput={withSearchInput}
-              isShowListWrapper={isShowListWrapper}
-              rightIconOption={rightIconOption}
-              grouping={grouping}
-              removeClippedSubviews={true}
-              afterListItem={
-                selectModalType === 'multi' ? renderFooter() : renderAfterListItem ? renderAfterListItem() : undefined
-              }
-              estimatedItemSize={estimatedItemSize || 80}
-              searchMarginBottom={grouping ? theme.sizeXS : undefined}
-              extraData={extraData}
-              keyExtractor={keyExtractor}
-            />
+            {isOpen && (
+              <FlatListScreen
+                autoFocus={true}
+                items={items}
+                style={{ flex: 1 }}
+                flatListStyle={flatListStyle}
+                renderItem={renderCustomItem || renderItem}
+                searchFunction={searchFunc}
+                renderListEmptyComponent={renderListEmptyComponent || _renderListEmptyComponent}
+                title={title}
+                onPressBack={onCloseModal}
+                isLoadingData={isLoadingData}
+                isShowFilterBtn={isShowFilterBtn}
+                filterFunction={filterFunction}
+                filterOptions={filterOptions}
+                placeholder={placeholder}
+                loading={loading}
+                withSearchInput={withSearchInput}
+                isShowListWrapper={isShowListWrapper}
+                rightIconOption={rightIconOption}
+                grouping={grouping}
+                removeClippedSubviews={true}
+                afterListItem={
+                  selectModalType === 'multi' ? renderFooter() : renderAfterListItem ? renderAfterListItem() : undefined
+                }
+                estimatedItemSize={estimatedItemSize || 80}
+                searchMarginBottom={grouping ? theme.sizeXS : undefined}
+                extraData={extraData}
+                keyExtractor={keyExtractor}
+              />
+            )}
           </>
 
           {children}

diff --git a/src/hooks/earning/useYieldPoolInfoByGroup.ts b/src/hooks/earning/useYieldPoolInfoByGroup.ts
@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { YieldPoolInfo } from '@subwallet/extension-base/types';
-import { useGetChainSlugs } from 'hooks/screen/Home/useGetChainSlugs';
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import { RootState } from 'stores/index';
+import { useGetChainSlugsByAccount } from 'hooks/useGetChainSlugsByAccount';
 
 const useYieldPoolInfoByGroup = (group: string): YieldPoolInfo[] => {
   const { poolInfoMap } = useSelector((state: RootState) => state.earning);
-  const chainsByAccountType = useGetChainSlugs();
+  const chainsByAccountType = useGetChainSlugsByAccount();
 
   return useMemo(() => {
     const result: YieldPoolInfo[] = [];
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-7e39a642b200fcd7f0d8.js"></script></head><body><div id="root">SubWallet</div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"><title>SubWallet</title><script inline inline-asset="fallback.js$" inline-asset-delete></script><script inline inline-asset="web-runner.js$" inline-asset-delete></script><script defer="defer" src="fallback-0b81a7f9f3a8fbf3b257.js"></script><script defer="defer" src="web-runner-a04d239a3ee82e81aa2c.js"></script></head><body><div id="root">SubWallet</div></body></html>