From 3e76408f642ca5fce061e5c30f61c5c62f2acd50 Mon Sep 17 00:00:00 2001 From: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:26:33 +0300 Subject: [PATCH] Squashed commit of the following: (#1476) commit fcebfeadfa5da939a851b7116398fd4815114d24 Author: Nikita-Polyakov Date: Tue Jul 23 09:38:39 2024 +0300 update SelectProvider commit 44c3d42d23f1bab3b29f95d2107bb9b7e6ed3494 Merge: d1043f83 1ed4735a Author: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Tue Jul 23 09:14:17 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit d1043f83b37d53b93a0c3d453544f9f08870a771 Merge: 2598efc2 89b21a35 Author: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Wed Jul 10 15:53:21 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit 2598efc204281f0a5249dbac2f3d93697197f3f6 Merge: 03944719 3daa74c2 Author: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Wed Jun 19 08:37:57 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit 03944719d1f9279a0a92286cfc01651e9283e778 Merge: 61aa10bd 4ae390cf Author: Stefan Popov Date: Wed Jun 5 12:31:28 2024 +0200 Merge branch 'develop' into feature/add-fearless-to-bridge commit 61aa10bd6ca8d3f009464331b7b0791c3460b0c6 Merge: 6b3e5f69 dcf97e30 Author: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Mon May 20 13:42:55 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit 6b3e5f692d038cb7ff339c98c9c1f378217be5db Merge: c85faf75 4597330c Author: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Thu May 16 16:55:12 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit c85faf75f723b5043ee627f29a5ef458672d263c Merge: fd40b06f 3bfb1282 Author: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Mon May 13 09:00:39 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit fd40b06f15adbfe1d8c3e6a8f9c57c96577e2646 Merge: 758746b0 0f996405 Author: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Fri Apr 26 12:12:53 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit 758746b05d72e89691bb8e281cd94cebcdf1c3bc Merge: 479f4d64 8c697f45 Author: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Thu Apr 25 12:54:24 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit 479f4d6425793128035a26daf4b97bae522bf5e5 Merge: faae7a31 11c1dd23 Author: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Wed Apr 24 12:11:43 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit faae7a31ad3690f2d3d6b3636d93c318ec8e5c96 Merge: 2ed6131c 32646a42 Author: NaghmeMohammadifar <45916098+Naghme98@users.noreply.github.com> Date: Mon Mar 25 11:29:17 2024 +0300 Merge branch 'develop' into feature/add-fearless-to-bridge commit 2ed6131c4ee75663e32405be654b59564c3fbef4 Author: Nikita-Polyakov Date: Fri Mar 1 12:48:26 2024 +0300 refactoring useExtensionProvider commit 15130fc87d18163d820cf1a227d2cdd5338f47da Author: Nikita-Polyakov Date: Fri Mar 1 12:37:25 2024 +0300 add Fearless provider --- public/wallet/Fearless.svg | 3 ++ .../shared/Dialog/SelectProvider.vue | 30 ++++++++----------- src/utils/ethers-util.ts | 10 +++++-- 3 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 public/wallet/Fearless.svg diff --git a/public/wallet/Fearless.svg b/public/wallet/Fearless.svg new file mode 100644 index 000000000..1b683f01e --- /dev/null +++ b/public/wallet/Fearless.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/shared/Dialog/SelectProvider.vue b/src/components/shared/Dialog/SelectProvider.vue index 9966c306a..2b6834331 100644 --- 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 { diff --git a/src/utils/ethers-util.ts b/src/utils/ethers-util.ts index 556f83cb9..6fcf30807 100644 --- 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,6 +104,8 @@ function createWeb3Instance(provider: any) { } async function useExtensionProvider(provider: Provider): Promise { + const injectedWindow = window as any; + let ethereumProvider!: any; switch (provider) { @@ -110,10 +113,13 @@ async function useExtensionProvider(provider: Provider): Promise { 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');