fix: 🐛 change version

AElfProject · Feb 7, 2024 · 27a735f · 27a735f
1 parent ec9b8d2
commit 27a735f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/packages/login/src/context.tsx b/packages/login/src/context.tsx
@@ -104,10 +104,13 @@ function WebLoginProvider({
   const [bridgeType, setBridgeType] = useState('unknown');
   const [loginId, setLoginId] = useState(0);
 
-  const initVersion = useMemo(
-    () => (localStorage.getItem(DISCOVER_LOGIN_EARGERLY_KEY) ? localStorage.getItem(WEB_LOGIN_VERSION) || 'v1' : 'v2'),
-    [],
-  );
+  const initVersion = useMemo(() => {
+    if (localStorage.getItem(DISCOVER_LOGIN_EARGERLY_KEY)) {
+      return localStorage.getItem(WEB_LOGIN_VERSION) || 'v1';
+    } else {
+      return localStorage.getItem(WEB_LOGIN_VERSION) || 'v2';
+    }
+  }, []);
 
   const [version, setVersion] = useState<string>(initVersion);
   const [changeVerBtnClicked, setChangeVerBtnClicked] = useState<{ version: string }>();
@@ -137,7 +140,7 @@ function WebLoginProvider({
   useEffect(() => {
     localStorage.setItem(WEB_LOGIN_VERSION, version === 'v1' ? 'v1' : 'v2');
     eventEmitter.emit(WebLoginEvents.CHANGE_PORTKEY_VERSION, changeVerBtnClicked?.version);
-  }, [version]);
+  }, [changeVerBtnClicked?.version, eventEmitter, version]);
 
   const setLoginStateInternal = useCallback(
     (newLoginState: WebLoginState) => {
@@ -445,6 +448,7 @@ function WebLoginProvider({
         <ExtraWallets
           headerClassName={headerClassName}
           contentClassName={contentClassName}
+          version={version}
           portkeyApi={version === 'v1' ? portkeyApiV1 : portkeyApi}
           elfApi={elfApi}
           discoverApi={discoverApi}

diff --git a/packages/login/src/wallets/extraWallets/index.tsx b/packages/login/src/wallets/extraWallets/index.tsx
@@ -28,6 +28,7 @@ interface IProps {
   elfApi: WalletHookInterface;
   discoverApi: DiscoverInterface;
   isBridgeNotExist: boolean;
+  version?: string;
 }
 export default function ExtraWallets({
   headerClassName,
@@ -36,10 +37,10 @@ export default function ExtraWallets({
   elfApi,
   discoverApi,
   isBridgeNotExist,
+  version = 'v2',
 }: IProps) {
   const isMobileDevice = isMobile();
   const { commonConfig, portkey: portkeyOpts, extraWallets } = useContext(ExtraWalletContext);
-  const { version } = useWebLogin();
   const isDiscoverMobileNotExist = useMemo(() => {
     // console.log(discoverApi.discoverDetected, 'discoverApi.discoverDetected');
     return (