feat: import cobo arugs address by event

package.json

@@ -42,7 +42,7 @@
     "@rabby-wallet/eth-walletconnect-keyring": "^2.0.4-beta.0",
     "@rabby-wallet/eth-watch-keyring": "^1.0.0",
     "@rabby-wallet/gnosis-sdk": "^1.3.5",
-    "@rabby-wallet/page-provider": "^0.1.23-alpha.2",
+    "@rabby-wallet/page-provider": "^0.1.23",
     "@rabby-wallet/rabby-api": "^0.6.23",
     "@rabby-wallet/rabby-security-engine": "^1.1.16",
     "@rabby-wallet/rabby-swap": "^0.0.29",

src/background/controller/provider/controller.ts

@@ -1257,6 +1257,22 @@ class ProviderController extends BaseController {
       data: { method: 'eth_getTransactionByHash', params: [hash] },
     });
   };
+
+  @Reflect.metadata('APPROVAL', [
+    'ImportAddress',
+    ({ data }) => {
+      if (!data.params[0]) {
+        throw ethErrors.rpc.invalidParams('params is required but got []');
+      }
+      if (!data.params[0]?.chainId) {
+        throw ethErrors.rpc.invalidParams('chainId is required');
+      }
+    },
+    { height: 628 },
+  ])
+  walletImportAddress = async () => {
+    return null;
+  };
 }
 
 export default new ProviderController();

src/background/controller/provider/index.ts

@@ -11,6 +11,8 @@ import {
 import rpcFlow from './rpcFlow';
 import internalMethod from './internalMethod';
 
+const IGNORE_CHECK = ['wallet_importAddress'];
+
 tab.on('tabRemove', (id) => {
   sessionService.deleteSession(id);
 });
@@ -24,11 +26,13 @@ export default async <T = void>(req: ProviderRequest): Promise<T> => {
     return internalMethod[method](req);
   }
 
-  const hasVault = keyringService.hasVault();
-  if (!hasVault) {
-    throw ethErrors.provider.userRejectedRequest({
-      message: 'wallet must has at least one account',
-    });
+  if (!IGNORE_CHECK.includes(method)) {
+    const hasVault = keyringService.hasVault();
+    if (!hasVault) {
+      throw ethErrors.provider.userRejectedRequest({
+        message: 'wallet must has at least one account',
+      });
+    }
   }
 
   return rpcFlow(req) as any;

src/ui/component/AddAddressOptions/index.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { openInternalPageInTab } from 'ui/utils/webapi';
 import IconWalletConnect from 'ui/assets/walletlogo/walletconnect.svg';
@@ -36,7 +36,7 @@ const getSortNum = (s: string) => WALLET_SORT_SCORE[s] || 999999;
 const AddAddressOptions = () => {
   const history = useHistory();
   const { t } = useTranslation();
-
+  const location = useLocation();
   const wallet = useWallet();
 
   const [selectedWalletType, setSelectedWalletType] = useState('');
@@ -101,7 +101,14 @@ const AddAddressOptions = () => {
 
   type Valueof<T> = T[keyof T];
   const connectRouter1 = React.useCallback(
-    (history, item: Valueof<typeof WALLET_BRAND_CONTENT>) => {
+    (
+      history,
+      item: Valueof<typeof WALLET_BRAND_CONTENT>,
+      params?: {
+        address: string;
+        chainId: number;
+      }
+    ) => {
       if (item.connectType === 'BitBox02Connect') {
         openInternalPageInTab('import/hardware?connectType=BITBOX02');
       } else if (item.connectType === 'GridPlusConnect') {
@@ -130,6 +137,7 @@ const AddAddressOptions = () => {
       ) {
         history.push({
           pathname: '/import/cobo-argus',
+          state: params,
         });
       } else {
         history.push({
@@ -142,8 +150,13 @@ const AddAddressOptions = () => {
     },
     []
   );
-  const connectRouter = (item: Valueof<typeof WALLET_BRAND_CONTENT>) =>
-    handleRouter((h) => connectRouter1(h, item));
+  const connectRouter = (
+    item: Valueof<typeof WALLET_BRAND_CONTENT>,
+    params?: {
+      address: string;
+      chainId: number;
+    }
+  ) => handleRouter((h) => connectRouter1(h, item, params));
   const brandWallet = React.useMemo(
     () =>
       (Object.values(WALLET_BRAND_CONTENT)
@@ -252,6 +265,30 @@ const AddAddressOptions = () => {
     [t]
   );
 
+  const [preventMount, setPreventMount] = React.useState(true);
+  React.useEffect(() => {
+    if (location.state) {
+      const { type, address, chainId } = location.state as any;
+      const brandContentKey = Object.keys(WALLET_BRAND_CONTENT).find((key) => {
+        const item = WALLET_BRAND_CONTENT[key] as IWalletBrandContent;
+        return item.name === type;
+      });
+
+      if (brandContentKey) {
+        connectRouter(WALLET_BRAND_CONTENT[brandContentKey], {
+          address,
+          chainId,
+        });
+      } else {
+        setPreventMount(false);
+      }
+    } else {
+      setPreventMount(false);
+    }
+  }, [location.state, connectRouter]);
+
+  if (preventMount) return null;
+
   return (
     <div className="rabby-container pb-[12px]" ref={rootRef}>
       {[createIMportAddrList, centerList].map((items, index) => (

src/ui/views/Approval/components/ImportAddress.tsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import { useHistory } from 'react-router';
+
+interface ConnectProps {
+  params: {
+    data: [
+      {
+        type: string;
+        address: string;
+        chainId: number;
+      }
+    ];
+    session: {
+      icon: string;
+      name: string;
+      origin: string;
+    };
+  };
+}
+
+export const ImportAddress = ({ params }: ConnectProps) => {
+  const history = useHistory();
+  const addressParams = params.data[0];
+
+  React.useEffect(() => {
+    history.replace({
+      pathname: '/add-address',
+      state: addressParams,
+    });
+  }, []);
+
+  return null;
+};

src/ui/views/Approval/components/index.ts

@@ -12,3 +12,4 @@ export { default as AddAsset } from './AddAsset';
 export { default as GetPublicKey } from './GetPublicKey';
 export { default as Decrypt } from './Decrypt';
 export { default as ETHSign } from './ETHSign';
+export { ImportAddress } from './ImportAddress';

src/ui/views/ImportCoboArgus/AddressInput.tsx

@@ -22,19 +22,33 @@ export const AddressInput: React.FC<Props> = ({
 
   return (
     <div>
-      <Input
-        prefix={
-          <img className="w-20 h-20 mr-8" src={chain.logo} alt={chain.name} />
-        }
-        autoFocus
-        onChange={(v) => onChange(v.target.value)}
-        value={value}
-        placeholder={t('page.newAddress.coboSafe.inputSafeModuleAddress')}
-        className={clsx('rounded-[6px] py-16 px-12', {
-          'border-gray-divider': !error,
-          'border-red': error,
-        })}
-      />
+      <div
+        className={clsx(
+          'flex items-start',
+          'rounded-[6px] py-16 px-12',
+          'border bg-white',
+          {
+            'border-gray-divider': !error,
+            'border-red': error,
+          }
+        )}
+      >
+        <img className="w-20 h-20 mr-8" src={chain.logo} alt={chain.name} />
+
+        <Input.TextArea
+          spellCheck={false}
+          bordered={false}
+          autoFocus
+          onChange={(v) => onChange(v.target.value)}
+          value={value}
+          placeholder={t('page.newAddress.coboSafe.inputSafeModuleAddress')}
+          className="p-0 min-h-[22px]"
+          autoSize={{
+            minRows: 1,
+            maxRows: 3,
+          }}
+        />
+      </div>
       <div className="mt-12 text-13 text-red">{error}</div>
     </div>
   );

src/ui/views/ImportCoboArgus/Header.tsx

@@ -4,7 +4,9 @@ import { useHistory } from 'react-router-dom';
 import IconBack from 'ui/assets/icon-back.svg';
 import IconCoboArgus from 'ui/assets/walletlogo/CoboArgus.svg';
 
-export const Header: React.FC = ({ children }) => {
+export const Header: React.FC<{
+  hasBack?: boolean;
+}> = ({ children, hasBack = true }) => {
   const history = useHistory();
 
   const handleClickBack = () => {
@@ -20,11 +22,15 @@ export const Header: React.FC = ({ children }) => {
   };
   return (
     <div className="create-new-header create-password-header h-[180px] py-[20px]">
-      <img
-        src={IconBack}
-        className="icon-back mb-0 relative z-10"
-        onClick={handleClickBack}
-      />
+      {hasBack ? (
+        <img
+          src={IconBack}
+          className="icon-back mb-0 relative z-10"
+          onClick={handleClickBack}
+        />
+      ) : (
+        <div className="h-24" />
+      )}
       <div className="relative w-[60px] h-[60px] mb-16 mx-auto mt-[-4px]">
         <img className="unlock-logo w-full h-full" src={IconCoboArgus} />
       </div>

src/ui/views/ImportCoboArgus/ImportCoboArgus.tsx

@@ -5,15 +5,20 @@ import { AddressInput } from './AddressInput';
 import { Button, message } from 'antd';
 import clsx from 'clsx';
 import { Header } from './Header';
-import { useWallet } from '@/ui/utils';
+import { useApproval, useWallet } from '@/ui/utils';
 import { isAddress } from 'web3-utils';
 import { SelectAddressPopup } from './SelectAddressPopup';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
+import { findChainByID } from '@/utils/chain';
 
 type Type = 'select-chain' | 'add-address' | 'select-address';
 
 export const ImportCoboArgus = () => {
+  const { state } = useLocation<{
+    address: string;
+    chainId: number | string;
+  }>();
   const { t } = useTranslation();
   const [selectedChain, setSelectedChain] = React.useState<CHAINS_ENUM>();
   const [inputAddress, setInputAddress] = React.useState<string>('');
@@ -23,6 +28,8 @@ export const ImportCoboArgus = () => {
   const [safeAddress, setSafeAddress] = React.useState<string>('');
   const wallet = useWallet();
   const history = useHistory();
+  const [hasImportError, setHasImportError] = React.useState<boolean>(false);
+  const isByImportAddressEvent = !!state;
 
   const handleNext = React.useCallback(async () => {
     if (selectedChain && step === 'select-chain') {
@@ -68,20 +75,39 @@ export const ImportCoboArgus = () => {
         },
       });
     } catch (e) {
+      setHasImportError(true);
       message.error(e.message);
     }
   }, [selectedChain, safeAddress, inputAddress]);
 
+  const [, , rejectApproval] = useApproval();
+  const handleClose = React.useCallback(() => {
+    rejectApproval();
+  }, [rejectApproval]);
+
+  React.useEffect(() => {
+    if (!state) return;
+    const { chainId, address } = state;
+    const chain = findChainByID(
+      typeof chainId === 'number' ? chainId : parseInt(chainId, 10)
+    );
+
+    if (chain) {
+      setStep('add-address');
+      setSelectedChain(chain.enum);
+      setInputAddress(address);
+    }
+  }, []);
+
   return (
     <section className="bg-gray-bg relative">
-      <Header>
+      <Header hasBack={!isByImportAddressEvent}>
         {step === 'select-chain' &&
           t('page.newAddress.coboSafe.whichChainIsYourCoboAddressOn')}
         {(step === 'add-address' || step === 'select-address') &&
           t('page.newAddress.coboSafe.addCoboArgusAddress')}
       </Header>
-
-      <div className="p-20 h-[420px] overflow-y-scroll pb-[100px]">
+      <div className="p-20 h-[calc(100vh-180px)] overflow-y-scroll pb-[100px]">
         {step === 'select-chain' && (
           <ChainList checked={selectedChain} onChecked={setSelectedChain} />
         )}
@@ -121,10 +147,10 @@ export const ImportCoboArgus = () => {
           }
           className="w-[200px] h-[44px] m-auto"
           type="primary"
-          onClick={handleNext}
+          onClick={hasImportError ? handleClose : handleNext}
           loading={isLoading}
         >
-          {t('global.next')}
+          {hasImportError ? t('global.ok') : t('global.next')}
         </Button>
       </footer>
     </section>

src/ui/views/ImportSuccess/index.tsx

@@ -5,7 +5,7 @@ import { matomoRequestEvent } from '@/utils/matomo-request';
 import { sortBy } from 'lodash';
 import { StrayPageWithButton } from 'ui/component';
 import AddressItem from 'ui/component/AddressList/AddressItem';
-import { getUiType } from 'ui/utils';
+import { getUiType, useApproval } from 'ui/utils';
 import { Account } from 'background/service/preference';
 import clsx from 'clsx';
 import stats from '@/stats';
@@ -45,6 +45,7 @@ const ImportSuccess = ({ isPopup = false }: { isPopup?: boolean }) => {
     isMnemonics = false,
     importedLength = 0,
   } = state;
+  const [, resolveApproval] = useApproval();
 
   const handleNextClick = async (e: React.MouseEvent<HTMLElement>) => {
     e?.stopPropagation();
@@ -56,6 +57,12 @@ const ImportSuccess = ({ isPopup = false }: { isPopup?: boolean }) => {
 
       return;
     }
+
+    if (getUiType().isNotification) {
+      resolveApproval();
+      return;
+    }
+
     history.push('/dashboard');
   };
   const importedIcon =

yarn.lock

@@ -3612,10 +3612,10 @@
     typescript "^4.5.0"
     web3-core "^1.6.0"
 
-"@rabby-wallet/page-provider@^0.1.23-alpha.2":
-  version "0.1.23-alpha.2"
-  resolved "https://registry.yarnpkg.com/@rabby-wallet/page-provider/-/page-provider-0.1.23-alpha.2.tgz#1757a18de9555fe60b2b552f58bc8ec1165fbe00"
-  integrity sha512-FVXmFxGzjFB4XFQM8Ol/TCaYMivQiuccVjjAOiR5Ukj7gr0ROcUQNSbDKWQ5tQ+1UvkTslxuaKXHFNX23tDjJA==
+"@rabby-wallet/page-provider@^0.1.23":
+  version "0.1.23"
+  resolved "https://registry.yarnpkg.com/@rabby-wallet/page-provider/-/page-provider-0.1.23.tgz#55f261bbef4bda012bc2c6974aca442681392242"
+  integrity sha512-K6UeLzsK7kFYiH+YsIkMgjg0IbXTUu6uY2MY3ng0vi2HsVyOGKQTICeynu0/eBt+Mq+WoBIfK7xXDh8J2gyD2g==
   dependencies:
     "@ledgerhq/devices" "^6.27.1"
     "@types/chrome" "^0.0.186"