feat: don't remove login panel when noCommonBaseModal set to true, up…

…date loginEagerly error text
AElfProject · Jul 19, 2024 · b958e85 · b958e85
1 parent ddbd47c
commit b958e85
Show file tree

Hide file tree

Showing 16 changed files with 139 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ const wallets = [
   new PortkeyDiscoverWallet({
     networkType: NETWORK_TYPE,
     chainId: CHAIN_ID,
-    autoRequestAccount: true,
+    autoRequestAccount: true, // If set to true, please contact Portkey to add whitelist @Rachel
     autoLogoutOnDisconnected: true,
     autoLogoutOnNetworkMismatch: true,
     autoLogoutOnAccountMismatch: true,

diff --git a/packages/base/package.json b/packages/base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-base",
-  "version": "0.1.2",
+  "version": "0.1.3-alpha.2",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/base/src/errors.ts b/packages/base/src/errors.ts
@@ -26,7 +26,7 @@ export const ERR_CODE = {
 export const ERR_CODE_MSG: {
   [key: number]: string;
 } = {
-  10001: 'Discover login eagerly fail',
+  10001: 'Automatic login failed. Please log in manually.',
   10002:
     'Unmatched network. Please switch the network through "My" > "Wallet" > "Switch Networks" to continue.',
   10003: 'Synchronising data on the blockchain. Please wait a few seconds.',

diff --git a/packages/bridge/package.json b/packages/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-bridge",
-  "version": "0.1.2",
+  "version": "0.1.3-alpha.2",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/bridge/src/bridge.ts b/packages/bridge/src/bridge.ts
@@ -24,15 +24,18 @@ import {
 } from './store';
 import { DIDWalletInfo, TelegramPlatform } from '@portkey/did-ui-react';
 import { isPortkeyApp } from '@aelf-web-login/utils';
+import { IBaseConfig } from '.';
 
 class Bridge {
   private _wallets: WalletAdapter[];
   private _activeWallet: WalletAdapter | undefined;
   private _loginResolve: (value: TWalletInfo) => void;
   private _loginReject: (error: TWalletError) => void;
   private _eventMap: Record<keyof IWalletAdapterEvents, any> = {} as IWalletAdapterEvents;
+  private _noCommonBaseModal: boolean;
 
-  constructor(wallets: WalletAdapter[]) {
+  constructor(wallets: WalletAdapter[], { noCommonBaseModal = false }: IBaseConfig) {
+    this._noCommonBaseModal = noCommonBaseModal;
     this._wallets = wallets;
     this._activeWallet = undefined;
     this._loginResolve = () => {};
@@ -192,11 +195,13 @@ class Bridge {
 
   onConnectErrorHandler = (err: TWalletError) => {
     console.log('in error event', err, this.activeWallet);
+    if (!this._noCommonBaseModal) {
+      this.closeLoginPanel();
+      this.closeNestedModal();
+    }
     this.unbindEvents();
-    this.closeLoginPanel();
     this.closeLoadingModal();
     this._loginReject(err);
-    this.closeNestedModal();
     dispatch(clearWalletInfo());
     dispatch(clearWalletType());
     dispatch(setLoginError(err));
@@ -250,8 +255,10 @@ class Bridge {
     } catch (e) {
       console.log('onUniqueWalletClick--', e);
     } finally {
-      this.closeLoadingModal();
-      this.closeLoginPanel();
+      if (!this._noCommonBaseModal) {
+        this.closeLoadingModal();
+        this.closeLoginPanel();
+      }
     }
   };
 

diff --git a/packages/bridge/src/index.ts b/packages/bridge/src/index.ts
@@ -36,10 +36,10 @@ export interface IBridgeAPI {
   store: AppStore;
   mountApp: () => void;
   unMountApp: () => void;
-  getSignIn: () => React.ReactNode;
+  getSignIn: (arg: React.ReactNode) => React.ReactNode;
 }
 export function initBridge({ baseConfig, wallets, didConfig }: IConfigProps): IBridgeAPI {
-  const bridgeInstance = new Bridge(wallets);
+  const bridgeInstance = new Bridge(wallets, baseConfig);
   ConfigProvider.setGlobalConfig(didConfig);
   console.log('init bridge');
 

diff --git a/packages/bridge/src/mountApp.tsx b/packages/bridge/src/mountApp.tsx
@@ -26,7 +26,7 @@ export function mountApp(
   const root = createRoot(SignInWrapperDom);
   root.render(
     <PortkeyProvider {...baseConfig.PortkeyProviderProps} networkType={baseConfig.networkType}>
-      <SignInModal bridgeInstance={bridgeInstance} wallets={wallets} baseConfig={baseConfig} />,
+      <SignInModal bridgeInstance={bridgeInstance} wallets={wallets} baseConfig={baseConfig} />
     </PortkeyProvider>,
   );
   containerElement.appendChild(SignInWrapperDom);
@@ -36,14 +36,16 @@ export function useMountSignIn(
   bridgeInstance: Bridge,
   wallets: WalletAdapter[],
   baseConfig: IBaseConfig,
-) {
+  children: React.ReactNode,
+): React.ReactNode {
   const SignInNode = useMemo(() => {
     return (
       <PortkeyProvider {...baseConfig.PortkeyProviderProps} networkType={baseConfig.networkType}>
-        <SignInModal bridgeInstance={bridgeInstance} wallets={wallets} baseConfig={baseConfig} />,
+        <SignInModal bridgeInstance={bridgeInstance} wallets={wallets} baseConfig={baseConfig} />
+        {children}
       </PortkeyProvider>
     );
-  }, [baseConfig, bridgeInstance, wallets]);
+  }, [baseConfig, bridgeInstance, children, wallets]);
   return SignInNode;
 }
 

diff --git a/packages/bridge/src/useVerifier.ts b/packages/bridge/src/useVerifier.ts
@@ -9,7 +9,27 @@ import {
 import { TChainId } from '@aelf-web-login/wallet-adapter-base';
 import { AccountType, OperationTypeEnum } from '@portkey/services';
 
-const useVerifier = () => {
+interface IUseVerifier {
+  getRecommendationVerifier: (chainId: TChainId) => Promise<IVerifier>;
+  verifySocialToken: ({
+    accountType,
+    token,
+    guardianIdentifier,
+    verifier,
+    chainId,
+    operationType,
+    operationDetails,
+  }: {
+    guardianIdentifier: string;
+    accountType: AccountType;
+    token?: string;
+    verifier: IVerifier;
+    chainId: TChainId;
+    operationType: OperationTypeEnum;
+    operationDetails: string;
+  }) => any;
+}
+const useVerifier: () => IUseVerifier = () => {
   const verifyToken = useVerifyToken();
 
   const socialLogin = useMemo<ISocialLoginConfig | undefined>(

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-react",
-  "version": "0.1.2",
+  "version": "0.1.3-alpha.2",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/react/src/index.tsx b/packages/react/src/index.tsx
@@ -5,8 +5,9 @@ import VConsole from 'vconsole';
 
 const HOOK_ERROR_MESSAGE =
   'Must call the provided initialization method`init` method before using hooks.';
-
+// let noCommonBaseModal = false;
 export const init = (options: IConfigProps): IBridgeAPI => {
+  // noCommonBaseModal = options.baseConfig.noCommonBaseModal ?? false;
   if (options.baseConfig.showVconsole) {
     new VConsole();
   }
@@ -40,21 +41,29 @@ interface IWebLoginProviderProps {
 }
 
 export const WebLoginProvider: React.FC<IWebLoginProviderProps> = ({ children, bridgeAPI }) => {
-  const { mountApp, unMountApp } = bridgeAPI ?? {
-    mountApp: () => {},
-    unMountApp: () => {},
+  // const { mountApp, unMountApp, getSignIn } = bridgeAPI ?? {
+  //   mountApp: () => {},
+  //   unMountApp: () => {},
+  //   getSignIn: () => null,
+  // };
+  // useEffect(() => {
+  //   if (noCommonBaseModal) {
+  //     return;
+  //   }
+  //   mountApp();
+  //   return unMountApp;
+  // }, [mountApp, unMountApp]);
+  const { getSignIn } = bridgeAPI ?? {
+    getSignIn: () => null,
   };
-  useEffect(() => {
-    mountApp();
-    return unMountApp;
-  }, [mountApp, unMountApp]);
+
   if (!bridgeAPI) {
     return null;
   }
   return (
     <WebLoginContext.Provider value={bridgeAPI}>
-      {/* {getSignIn()} */}
-      {children}
+      {/* {noCommonBaseModal ? getSignIn(children) : children} */}
+      {getSignIn(children)}
     </WebLoginContext.Provider>
   );
 };

diff --git a/packages/starter/src/Demo/demo.tsx b/packages/starter/src/Demo/demo.tsx
@@ -48,23 +48,23 @@ const didConfig = {
 };
 
 // const SignInProxy = () => {
-//   console.log('SignInProxy-----------');
-//   const { isLocking } = useConnectWallet();
-//   console.log('-----', isLocking);
+//   // console.log('SignInProxy-----------');
+//   // const { isLocking } = useConnectWallet();
+//   // console.log('-----', isLocking);
 //   return <div>111</div>;
 // };
 
 const baseConfig = {
   // SignInComponent: SignInProxy,
   PortkeyProviderProps: {
-    theme: 'light',
+    theme: 'dark' as any,
   },
   showVconsole: true,
   networkType: NETWORK_TYPE,
   chainId: CHAIN_ID,
   keyboard: true,
-  noCommonBaseModal: true,
-  design: SignInDesignEnum.Web2Design, // "SocialDesign" | "CryptoDesign" | "Web2Design"
+  // noCommonBaseModal: true,
+  design: SignInDesignEnum.CryptoDesign, // "SocialDesign" | "CryptoDesign" | "Web2Design"
   titleForSocialDesign: 'Crypto wallet',
   iconSrcForSocialDesign:
     'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNTYiIHZpZXdCb3g9IjAgMCA1NiA1NiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgaWQ9IkVsZiBFeHBsb3JlciI+CjxyZWN0IHdpZHRoPSI1NiIgaGVpZ2h0PSI1NiIgZmlsbD0id2hpdGUiLz4KPHBhdGggaWQ9IlNoYXBlIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTMwLjAwMDMgMTEuODQyQzMzLjEwNjkgMTEuODQyIDM1LjYyNTIgOS4zMjM3MSAzNS42MjUyIDYuMjE3MTlDMzUuNjI1MiAzLjExMDY4IDMzLjEwNjkgMC41OTIzNDYgMzAuMDAwMyAwLjU5MjM0NkMyNi44OTM4IDAuNTkyMzQ2IDI0LjM3NTUgMy4xMTA2OCAyNC4zNzU1IDYuMjE3MTlDMjQuMzc1NSA5LjMyMzcxIDI2Ljg5MzggMTEuODQyIDMwLjAwMDMgMTEuODQyWk01NS40MDkzIDI4LjAzNzhDNTUuNDA5MyAzNC4zNTc5IDUwLjI4NTggMzkuNDgxNCA0My45NjU3IDM5LjQ4MTRDMzcuNjQ1NSAzOS40ODE0IDMyLjUyMiAzNC4zNTc5IDMyLjUyMiAyOC4wMzc4QzMyLjUyMiAyMS43MTc2IDM3LjY0NTUgMTYuNTk0MSA0My45NjU3IDE2LjU5NDFDNTAuMjg1OCAxNi41OTQxIDU1LjQwOTMgMjEuNzE3NiA1NS40MDkzIDI4LjAzNzhaTTM1LjYyNTIgNDkuODU4MkMzNS42MjUyIDUyLjk2NDggMzMuMTA2OSA1NS40ODMxIDMwLjAwMDMgNTUuNDgzMUMyNi44OTM4IDU1LjQ4MzEgMjQuMzc1NSA1Mi45NjQ4IDI0LjM3NTUgNDkuODU4MkMyNC4zNzU1IDQ2Ljc1MTcgMjYuODkzOCA0NC4yMzM0IDMwLjAwMDMgNDQuMjMzNEMzMy4xMDY5IDQ0LjIzMzQgMzUuNjI1MiA0Ni43NTE3IDM1LjYyNTIgNDkuODU4MlpNMS4xOTczMyAxMi4yM0MtMC40NTEzMzEgMTYuNTk0MSAxLjg3NjE5IDIxLjU0MDEgNi4yNDAzIDIzLjE4ODdDOS4xNDk3IDI0LjI1NTUgMTIuMjUzMSAyMy42NzM2IDE0LjQ4MzYgMjEuODMxQzE2LjUyMDIgMjAuMzc2MyAxOS4xMzg3IDE5Ljg5MTQgMjEuNjYwMSAyMC44NjEyQzIzLjMwODggMjEuNDQzMSAyNC41Njk1IDIyLjUwOTkgMjUuNDQyNCAyMy44Njc2TDI1LjUzOTMgMjQuMDYxNUMyNS45MjczIDI0LjY0MzQgMjYuNTA5MSAyNS4yMjUzIDI3LjI4NSAyNS40MTkzQzI5LjAzMDYgMjYuMDk4MSAzMS4wNjcyIDI1LjEyODMgMzEuNjQ5MSAyMy4zODI3QzMyLjMyOCAyMS42MzcgMzEuMzU4MiAxOS42MDA1IDI5LjYxMjUgMTkuMDE4NkMyOC44MzY3IDE4LjcyNzYgMjguMDYwOCAxOC43Mjc2IDI3LjI4NSAxOS4wMTg2QzI1LjczMzMgMTkuNTAzNSAyMy45ODc3IDE5LjUwMzUgMjIuMzM5IDE4LjkyMTZDMTkuOTE0NSAxOC4wNDg4IDE4LjI2NTggMTYuMTA5MiAxNy41ODcgMTMuODc4NkwxNy40OSAxMy42ODQ3QzE3LjQ5IDEzLjU4NzcgMTcuNDkgMTMuNDkwNyAxNy4zOTMgMTMuNDkwN1YxMy4yOTY4QzE2LjcxNDIgMTAuNTgxMyAxNC44NzE1IDguMjUzNzggMTIuMDU5MSA3LjI4Mzk4QzcuNjk1IDUuNTM4MzQgMi43NDkwMSA3Ljc2ODg4IDEuMTk3MzMgMTIuMjNaTTYuMjQwMyAzMi44ODY4QzEuODc2MTkgMzQuNTM1NCAtMC40NTEzMzEgMzkuNDgxNCAxLjE5NzMzIDQzLjg0NTVDMi44NDU5OSA0OC4zMDY2IDcuNjk1IDUwLjUzNzIgMTIuMDU5MSA0OC43OTE1QzE0Ljg3MTUgNDcuODIxNyAxNi43MTQyIDQ1LjQ5NDIgMTcuMzkzIDQyLjc3ODdWNDIuNTg0OEMxNy40OSA0Mi41ODQ4IDE3LjQ5IDQyLjQ4NzggMTcuNDkgNDIuMzkwOEwxNy41ODcgNDIuMTk2OUMxOC4yNjU4IDM5Ljk2NjMgMTkuOTE0NSAzOC4wMjY3IDIyLjMzOSAzNy4xNTM5QzIzLjk4NzcgMzYuNTcyIDI1LjczMzMgMzYuNTcyIDI3LjI4NSAzNy4wNTY5QzI4LjA2MDggMzcuMzQ3OSAyOC44MzY3IDM3LjM0NzkgMjkuNjEyNSAzNy4wNTY5QzMxLjM1ODIgMzYuNDc1IDMyLjMyOCAzNC40Mzg1IDMxLjY0OTEgMzIuNjkyOEMzMS4wNjcyIDMwLjk0NzIgMjkuMDMwNiAyOS45Nzc0IDI3LjI4NSAzMC42NTYyQzI2LjUwOTEgMzAuODUwMiAyNS45MjczIDMxLjQzMjEgMjUuNTM5MyAzMi4wMTRMMjUuNDQyNCAzMi4yMDc5QzI0LjU2OTUgMzMuNTY1NiAyMy4zMDg4IDM0LjYzMjQgMjEuNjYwMSAzNS4yMTQzQzE5LjEzODcgMzYuMTg0MSAxNi41MjAyIDM1LjY5OTIgMTQuNDgzNiAzNC4yNDQ1QzEyLjI1MzEgMzIuNDAxOSA5LjE0OTcgMzEuODIgNi4yNDAzIDMyLjg4NjhaIiBmaWxsPSIjMjY2Q0QzIi8+CjwvZz4KPC9zdmc+Cg==',
@@ -80,7 +80,7 @@ const wallets = [
   new PortkeyDiscoverWallet({
     networkType: NETWORK_TYPE,
     chainId: CHAIN_ID,
-    autoRequestAccount: true,
+    autoRequestAccount: true, // If set to true, please contact Portkey to add whitelist @Rachel
     autoLogoutOnDisconnected: true,
     autoLogoutOnNetworkMismatch: true,
     autoLogoutOnAccountMismatch: true,

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/utils",
-  "version": "0.1.2",
+  "version": "0.1.3-alpha.2",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/wallets/night-elf/package.json b/packages/wallets/night-elf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-night-elf",
-  "version": "0.1.2",
+  "version": "0.1.3-alpha.2",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/wallets/portkey-aa/package.json b/packages/wallets/portkey-aa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-portkey-aa",
-  "version": "0.1.2",
+  "version": "0.1.3-alpha.2",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/wallets/portkey-discover/package.json b/packages/wallets/portkey-discover/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-portkey-discover",
-  "version": "0.1.2",
+  "version": "0.1.3-alpha.2",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml