Merge pull request #223 from AElfProject/fix/mobile-login

Discover login required app

Author: hzz780

packages/base/src/errors.ts

@@ -25,6 +25,7 @@ export const ERR_CODE = {
   GET_LOGIN_STATUS_FAIL: 10022,
   IN_FINISH_BUT_STATUS_IS_NOT_SUCCESS: 10023,
   UNKNOWN: 10024,
+  DISCOVER_LOGIN_REQUIRED_APP: 10025,
 };
 
 export const ERR_CODE_MSG: {
@@ -57,6 +58,7 @@ export const ERR_CODE_MSG: {
   10022: 'Call getLoginStatus but the result is not pass',
   10023: 'Login completed, but the isLoginStatus is not success. Please log in again',
   10024: 'Unknown error',
+  10025: 'Please use the FairyVault app or the FairyVault browser extension on your computer.',
 };
 
 export function makeError(code: number, nativeError?: any): TWalletError {

packages/wallets/fairy-vault-discover/src/index.ts

@@ -169,7 +169,9 @@ export class FairyVaultDiscoverWallet extends BaseWalletAdapter {
 
   async login(): Promise<TWalletInfo> {
     if (isMobileDevices() && !isFairyVaultApp()) {
-      openPageInDiscover(undefined, undefined);
+      // TODO: open in FairyVault App
+      // openPageInDiscover(undefined, undefined);
+      this.emit('error', makeError(ERR_CODE.DISCOVER_LOGIN_REQUIRED_APP));
       return;
     }
     try {

packages/wallets/fairy-vault-discover/src/utils.ts

@@ -6,32 +6,31 @@ export function zeroFill(str: string | BN) {
 }
 
 export function openPageInDiscover(url?: string, version?: 'v1') {
-  console.info('TODO List', url, version);
-  // TODO: change link to fairy vault
-  // try {
-  //   window.location.href = scheme.formatScheme({
-  //     action: 'linkDapp',
-  //     version,
-  //     domain: window.location.host,
-  //     custom: {
-  //       url: url || window.location.href,
-  //     },
-  //   });
-  //   const downloadUrl = 'https://portkey.finance/';
-  //   setTimeout(() => {
-  //     const hidden =
-  //       window.document.hidden ||
-  //       (window.document as any).mozHidden ||
-  //       (window.document as any).msHidden ||
-  //       (window.document as any).webkitHidden;
-  //     if (typeof hidden !== 'undefined' && hidden === true) {
-  //       return;
-  //     }
-  //     window.location.href = downloadUrl;
-  //   }, 2000);
-  // } catch (error) {
-  //   // can‘t open app cannot go into this logic
-  //   console.error(error);
-  //   window.open('https://portkey.finance', '_blank');
-  // }
+  try {
+    window.location.href = scheme.formatScheme({
+      scheme: 'portkey.fairyvault',
+      action: 'linkDapp',
+      version,
+      domain: window.location.host,
+      custom: {
+        url: url || window.location.href,
+      },
+    });
+    const downloadUrl = 'https://fairyvault.com/';
+    setTimeout(() => {
+      const hidden =
+        window.document.hidden ||
+        (window.document as any).mozHidden ||
+        (window.document as any).msHidden ||
+        (window.document as any).webkitHidden;
+      if (typeof hidden !== 'undefined' && hidden === true) {
+        return;
+      }
+      window.location.href = downloadUrl;
+    }, 2000);
+  } catch (error) {
+    // can‘t open app cannot go into this logic
+    console.error(error);
+    window.open('https://fairyvault.com', '_blank');
+  }
 }