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

fix: change execute time for initializeTelegram
AElfProject · Sep 12, 2024 · 91a2580 · 91a2580
2 parents 647f558 + c09ab5b
commit 91a2580
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 12 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.6",
+  "version": "0.1.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.6",
+  "version": "0.1.7",
   "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
@@ -247,6 +247,14 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
   // const isLocking = store.getState().isLocking;
   // console.log('isLocking', isLocking);
 
+  const initializeTelegram = () => {
+    const handleLogout = async () => {
+      await bridgeInstance.onPortkeyAAUnLock(defaultPin);
+      await bridgeInstance.doubleCheckDisconnect();
+    };
+    TelegramPlatform.initializeTelegramWebApp({ handleLogout });
+  };
+
   useEffect(() => {
     if (cancelAutoLoginInTelegram) {
       return;
@@ -255,11 +263,7 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
       return;
     }
     console.log('begin to init and execute handleTelegram', TelegramPlatform.isTelegramPlatform());
-    const handleLogout = async () => {
-      await bridgeInstance.onPortkeyAAUnLock(defaultPin);
-      await bridgeInstance.doubleCheckDisconnect();
-    };
-    TelegramPlatform.initializeTelegramWebApp({ handleLogout });
+    initializeTelegram();
     async function autoAuthInTelegram() {
       console.log('begin to excute autoAuthInTelegram');
       if (enhancedLocalStorage.getItem('connectedWallet') === PORTKEYAA) {
@@ -273,6 +277,7 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
   }, [bridgeInstance, cancelAutoLoginInTelegram, defaultPin, handleTelegram]);
 
   bridgeInstance.autoLogin = () => {
+    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.6",
+  "version": "0.1.7",
   "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.6",
+  "version": "0.1.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.6",
+  "version": "0.1.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.6",
+  "version": "0.1.7",
   "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.6",
+  "version": "0.1.7",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",