Merge branch 'develop' into feature/swap-layout

sora-xor · Jul 23, 2024 · 060b036 · 060b036
2 parents 94335ab + 3e76408
commit 060b036
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/public/wallet/Fearless.svg b/public/wallet/Fearless.svg
diff --git a/src/components/shared/Dialog/SelectProvider.vue b/src/components/shared/Dialog/SelectProvider.vue
@@ -43,26 +43,22 @@ export default class SelectProviderDialog extends Mixins(WalletConnectMixin) {
       return [Provider.WalletConnect];
     }
 
-    return [Provider.Metamask, Provider.SubWallet, Provider.TrustWallet, Provider.WalletConnect];
+    return Object.keys(Provider).map((key) => Provider[key]);
   }
 
   get wallets(): WalletInfo[] {
-    return Object.keys(Provider)
-      .filter((key) => this.allowedProviders.includes(key as Provider))
-      .map((key) => {
-        const provider = Provider[key];
-
-        return {
-          extensionName: provider,
-          title: provider,
-          chromeUrl: '',
-          mozillaUrl: '',
-          logo: {
-            src: this.getEvmProviderIcon(provider),
-            alt: provider,
-          },
-        };
-      });
+    return this.allowedProviders.map((provider) => {
+      return {
+        extensionName: provider,
+        title: provider,
+        chromeUrl: '',
+        mozillaUrl: '',
+        logo: {
+          src: this.getEvmProviderIcon(provider),
+          alt: provider,
+        },
+      };
+    });
   }
 
   get selectedProvider(): Nullable<Provider> {

diff --git a/src/utils/ethers-util.ts b/src/utils/ethers-util.ts
@@ -20,6 +20,7 @@ let ethereumProvider!: any;
 let ethersInstance: ethersProvider | null = null;
 
 export enum Provider {
+  Fearless = 'Fearless',
   Metamask = 'Metamask',
   SubWallet = 'SubWallet',
   TrustWallet = 'TrustWallet',
@@ -103,17 +104,22 @@ function createWeb3Instance(provider: any) {
 }
 
 async function useExtensionProvider(provider: Provider): Promise<string> {
+  const injectedWindow = window as any;
+
   let ethereumProvider!: any;
 
   switch (provider) {
     case Provider.Metamask:
       ethereumProvider = await detectEthereumProvider({ mustBeMetaMask: true, timeout: 0 });
       break;
     case Provider.SubWallet:
-      ethereumProvider = (window as any).SubWallet;
+      ethereumProvider = injectedWindow.SubWallet;
       break;
     case Provider.TrustWallet:
-      ethereumProvider = (window as any).trustwallet;
+      ethereumProvider = injectedWindow.trustwallet;
+      break;
+    case Provider.Fearless:
+      ethereumProvider = injectedWindow.fearlessWallet;
       break;
     default:
       throw new Error('Unknown provider');