Merge pull request #114 from AElfProject/feature/awaken-access

fix: Automatically reconnect after logging out of the app
AElfProject · Jul 23, 2024 · fbd5b49 · fbd5b49
2 parents 3745684 + ca02523
commit fbd5b49
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 14 deletions.
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.3-alpha.5",
+  "version": "0.1.3-alpha.7",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

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.3-alpha.5",
+  "version": "0.1.3-alpha.7",
   "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
@@ -81,7 +81,12 @@ class Bridge {
     return new Promise((resolve, reject) => {
       this._loginResolve = resolve;
       this._loginReject = reject;
-      this.openLoginPanel();
+      if (isPortkeyApp()) {
+        console.log('begin to execute onUniqueWalletClick in PortkeyApp');
+        this.onUniqueWalletClick('PortkeyDiscover');
+      } else {
+        this.openLoginPanel();
+      }
     });
   };
 

diff --git a/packages/bridge/src/ui.css b/packages/bridge/src/ui.css
@@ -64,6 +64,7 @@
   display: flex;
   height: 20px;
   gap: 12px;
+  justify-content: flex-end;
 }
 .crypto-extra-image-arrow {
   width: 12px;

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.3-alpha.5",
+  "version": "0.1.3-alpha.7",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/starter/src/Demo/demo.tsx b/packages/starter/src/Demo/demo.tsx
@@ -58,13 +58,13 @@ const baseConfig = {
   // ConfirmLogoutDialog: CustomizedConfirmLogoutDialog,
   // SignInComponent: SignInProxy,
   PortkeyProviderProps: {
-    theme: 'dark' as any,
+    theme: 'light' as any,
   },
   showVconsole: true,
   networkType: NETWORK_TYPE,
   chainId: CHAIN_ID,
   keyboard: true,
-  // noCommonBaseModal: true,
+  noCommonBaseModal: false,
   design: SignInDesignEnum.CryptoDesign, // "SocialDesign" | "CryptoDesign" | "Web2Design"
   titleForSocialDesign: 'Crypto wallet',
   iconSrcForSocialDesign:

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/utils",
-  "version": "0.1.3-alpha.5",
+  "version": "0.1.3-alpha.7",
   "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.3-alpha.5",
+  "version": "0.1.3-alpha.7",
   "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.3-alpha.5",
+  "version": "0.1.3-alpha.7",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/wallets/portkey-aa/src/index.ts b/packages/wallets/portkey-aa/src/index.ts
@@ -92,11 +92,18 @@ export class PortkeyAAWallet extends BaseWalletAdapter {
       }
 
       let nickName = 'Wallet 01';
+      try {
+        const holderInfo = await did.getCAHolderInfo(didWalletInfo.chainId);
+        nickName = holderInfo.nickName;
+      } catch (error) {
+        console.log('portkeyAA login and execute did.getCAHolderInfo. nickName:', nickName, error);
+      }
 
-      const holderInfo = await did.getCAHolderInfo(didWalletInfo.chainId);
-      nickName = holderInfo.nickName;
-
-      await did.save(didWalletInfo.pin, this.appName);
+      try {
+        await did.save(didWalletInfo.pin, this.appName);
+      } catch (e) {
+        console.log('portkeyAA login and execute did.save.', e);
+      }
 
       const portkeyInfo = {
         ...didWalletInfo,

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.3-alpha.5",
+  "version": "0.1.3-alpha.7",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",