feat: remove @aelf-web-login/utils from other package, resovle XMLHtt…

…pRequest is undefined
AElfProject · Aug 7, 2024 · 55f9d52 · 55f9d52
1 parent 99259c3
commit 55f9d52
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 131 deletions.
diff --git a/packages/base/src/utils/index.ts b/packages/base/src/utils/index.ts
@@ -1,6 +1,10 @@
 import { isMobile } from './isMobile';
 import { getOriginalAddress } from './getOriginalAddress';
+import { isPortkeyApp } from './isPortkeyApp';
+import { sleep } from './sleep';
 export default {
   isMobile,
   getOriginalAddress,
+  isPortkeyApp,
+  sleep,
 };
diff --git a/packages/base/src/utils/isPortkeyApp.ts b/packages/base/src/utils/isPortkeyApp.ts
@@ -0,0 +1,7 @@
+export function isPortkeyApp() {
+  if (typeof window !== 'object') {
+    return false;
+  } else {
+    return window.navigator.userAgent.includes('Portkey');
+  }
+}
diff --git a/packages/base/src/utils/sleep.ts b/packages/base/src/utils/sleep.ts
@@ -0,0 +1,5 @@
+function sleep(milliSeconds: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, milliSeconds));
+}
+
+export { sleep };
diff --git a/packages/bridge/package.json b/packages/bridge/package.json
@@ -25,7 +25,6 @@
     "build": "father build"
   },
   "dependencies": {
-    "@aelf-web-login/utils": "workspace:*",
     "@aelf-web-login/wallet-adapter-base": "workspace:*",
     "@portkey/services": "2.7.2",
     "@reduxjs/toolkit": "^2.2.3",

diff --git a/packages/bridge/src/bridge.ts b/packages/bridge/src/bridge.ts
@@ -11,6 +11,7 @@ import {
   TSignatureParams,
   enhancedLocalStorage,
   IWalletAdapterEvents,
+  utils,
 } from '@aelf-web-login/wallet-adapter-base';
 import {
   setWalletInfo,
@@ -23,9 +24,9 @@ import {
   clearLoginError,
 } from './store';
 import { DIDWalletInfo, TelegramPlatform } from '@portkey/did-ui-react';
-import { isPortkeyApp } from '@aelf-web-login/utils';
 import { IBaseConfig } from '.';
 
+const { isPortkeyApp } = utils;
 let isDisconnectClicked = false;
 class Bridge {
   private _wallets: WalletAdapter[];

diff --git a/packages/bridge/src/useTelegram.ts b/packages/bridge/src/useTelegram.ts
@@ -17,13 +17,14 @@ import {
   IVerifyInfo,
   TelegramPlatform,
 } from '@portkey/did-ui-react';
-import { DEFAULT_PIN, TChainId, NetworkEnum } from '@aelf-web-login/wallet-adapter-base';
+import { DEFAULT_PIN, TChainId, NetworkEnum, utils } from '@aelf-web-login/wallet-adapter-base';
 import { useCallback, useMemo, useState } from 'react';
-import { sleep } from '@aelf-web-login/utils';
 import { Bridge } from './bridge';
 import useVerifier from './useVerifier';
 import useLockCallback from './useLockCallback';
 
+const { sleep } = utils;
+
 export enum SocialLoginType {
   APPLE = 'Apple',
   GOOGLE = 'Google',

diff --git a/packages/react/src/index.tsx b/packages/react/src/index.tsx
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
 import React, { useCallback, useMemo, useState, useSyncExternalStore } from 'react';
 import { initBridge, IConfigProps, IBridgeAPI } from '@aelf-web-login/wallet-adapter-bridge';
-import VConsole from 'vconsole';
 import {
   ConnectedWallet,
   enhancedLocalStorage,
@@ -13,10 +12,12 @@ const HOOK_ERROR_MESSAGE =
 // let noCommonBaseModal = false;
 export const init = (options: IConfigProps): IBridgeAPI => {
   // noCommonBaseModal = options.baseConfig.noCommonBaseModal ?? false;
-  if (options.baseConfig.showVconsole) {
+  if (options.baseConfig.showVconsole && typeof window !== 'undefined') {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const VConsole = require('vconsole');
     new VConsole();
   }
-  console.log('aelf-web-login-init..............');
+  console.log('aelf-web-login-init..............30');
   function initScriptAndMountApp() {
     // const HOSTNAME_PREFIX_LIST = ['tg.', 'tg-test.', 'localhost'];
     const TELEGRAM_SRC = 'https://telegram.org/js/telegram-web-app.js';

diff --git a/packages/wallets/night-elf/package.json b/packages/wallets/night-elf/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@aelf-web-login/wallet-adapter-base": "workspace:*",
     "@portkey/contracts": "^2.6.2",
-    "aelf-bridge": "0.0.10",
+    "aelf-bridge": "^0.0.11-alpha.4",
     "bn.js": "^5.2.1"
   },
   "devDependencies": {

diff --git a/packages/wallets/portkey-discover/package.json b/packages/wallets/portkey-discover/package.json
@@ -25,7 +25,6 @@
     "build": "father build"
   },
   "dependencies": {
-    "@aelf-web-login/utils": "workspace:*",
     "@aelf-web-login/wallet-adapter-base": "workspace:*",
     "@portkey/contracts": "^2.6.2",
     "@portkey/detect-provider": "^2.2.0",