Merge pull request #153 from AElfProject/feature/ecoEarn-support

fix: auto unlock in tg even if cancelAutoLoginInTelegram is true
AElfProject · Sep 12, 2024 · 4e0a46c · 4e0a46c
2 parents 91a2580 + 12d18e6
commit 4e0a46c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 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.7",
+  "version": "0.1.8",
   "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.7",
+  "version": "0.1.8",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

diff --git a/packages/bridge/src/ui.tsx b/packages/bridge/src/ui.tsx
@@ -256,9 +256,6 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
   };
 
   useEffect(() => {
-    if (cancelAutoLoginInTelegram) {
-      return;
-    }
     if (!TelegramPlatform.isTelegramPlatform()) {
       return;
     }
@@ -270,14 +267,16 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
         await bridgeInstance.onPortkeyAAUnLock(defaultPin);
         return;
       }
-      console.log('begin to excute handleTelegram');
-      handleTelegram();
+      if (!cancelAutoLoginInTelegram) {
+        console.log('begin to excute handleTelegram');
+        handleTelegram();
+      }
     }
     autoAuthInTelegram();
   }, [bridgeInstance, cancelAutoLoginInTelegram, defaultPin, handleTelegram]);
 
   bridgeInstance.autoLogin = () => {
-    initializeTelegram();
+    // initializeTelegram();
     handleTelegram();
   };
 

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

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