From a34570854d454e009d6c55cb2b3ebdf8dcf7132f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=BDiga=20Kokelj?= <ziga.kokelj@gmail.com>
Date: Tue, 19 Mar 2024 12:51:36 +0100
Subject: [PATCH] Display errors if other wallets are also installed alongside
 MetaMask (#1837)

---
 tools/walletextension/api/static/favicon.ico   | Bin 996 -> 1260 bytes
 .../components/providers/wallet-provider.tsx   |   6 +++---
 .../frontend/src/services/ethService.ts        |  17 +++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/tools/walletextension/api/static/favicon.ico b/tools/walletextension/api/static/favicon.ico
index 1bb8f324a18a956628274ccbacffa64f1eeabc5f..0e8dea2f715d4fdc30aa83101021fe05fb3e2c21 100644
GIT binary patch
delta 1197
zcmV;e1XBCt2kZ%uB#}WBks}>{1c6CJK~#7F?U_j^eQ^}WzmLD6Orgvf7HpI$A(<8|
z2n)l;v=G^{FlJ#&5h6q)SqPa{giH&vu#qzC3>g-p$Q<tfo?m%A&*P5o&*J~7+k3Zr
z?(Ll4J?H$+IagzCZOuUh_V)HzTwH{Yj}PR)aU8O;vM@hC4>i$<HGpt`aB#rv>@58K
z{UHZ3A~Q2nRU=HK2wz=YAt@;dJ3Bj&gGQsl`1m-|($b(7k_;f!FrvG=8@ai;Py<tQ
zbMqQ0H-v_UA~-l0$H&JA3kw5(KcqtU#Ky+r;NSpzdwWoVq!=JPJUmz&$PH#)Zf|c<
zTwIK?u`$R+vJ0J@oG=%EqSaH1m6a779UY+r$u30P+}vPlY6{!i+qk&6VA;jl*%>A#
z;@5-jDK9TaPfrh&AlZe!!o|e}adB~oh=@QyKmdys3Rpvs@^y7}XlZGIQdBcQ9}5c$
zBqt{$IyxE&2?_A@^weIft*uo>dEyU@#M9FgCMPG^L0M;MX$e7pK|xR(Sur4$*Vk9J
zfyKwiYhCT_?G5Ye>rjd!7pktVMtXYsm)FC?!}0w5tUb4}vBBKj9E%a6p`igyO-)dO
z;ushj8v3#{pcJWV0AXuui|OfUwh0nSjZh_sv$L~VwW<%LNOB*2oSd96I5>!ym>71h
z#0XV_czAeNlDwsVr6pWlUA5<DXJ?R$(bDL5czb)Zw?I%ivAeqqx%`L$Y9hH7`faFY
zfT^h|nwy((czDQ;#>U1^G8E_w3kzBqLq}Cr6{Mhw3z70QH8rd>CPqg`QCL{`L59-j
z%*>47ZhU=x&01Fa6@%g|q_2E`e?Lk}N<PSt@~f+>@b&e7WrZB=9frzrx}KAh!=6R;
zk|^j6$UW@r?6|(ZKJFd*&nx>u#?8%*+uz@3*ZJ~+tE{a2_L-fXo!rC21IIT`qI6JH
z3$?emqoAOG{qODVMQLd%TVef`_w(~(=j7jAU0vTklZrmtC!(UFu(GlOA!G+}M@I+p
z^Yihpd|6q4nL*{rEeL+)KPk_@9o8FD51~taeLdSBXpAF>T=%)VyJK!KF)_jMMcOB~
z+1lFDx>iL+g~4a=Z-iav8+(J-y}Y~x^-!EfslnG>d0JJ<Hi3bG?40TxA-B<oT!^^5
zycCpGbt9u!J~A?*O_k&}x<wkrf|xN(TU#3&-H1Vdv;mQkk%BVRtb~Mwu>bliPs&pn
zZDwXB_#8gFv4s$0grEVG=V?V!Qc@rV-B}OKl1O>ozE}u%cXt#O6$#1-8jz8Z@o86;
z3Mno{c_|1QKrP_%@-me0)p$h>1P!2?Brh)yYin!xjfe_jGJ;a$Z{&YJ@YBdPfUhuN
zY&JK4Hw9&68<3coh>eX67z^q#1_lNM<zzQB_xJZmO-*HEbs?mT-3cl`Xml?IMKSRB
z_=uyUBdCp7<%$1U=%-QDfYZ}cHa3w8O)=!6ssXfPQ=2KJcA{+4+S&@asQ!iKy>=2)
zz|lvK^Ye2k!6=`Y#15sDDo^~AAf~3sSQzafBcCoWFE8w)pE39g^wKz+BYEJg00000
LNkvXXu0mjfI>tVx

delta 931
zcmV;U16=&<3FHTmB#}8Bks}p<19?eAK~!i%?U_#~Jy8_L&-2LhzsUcxV_`wrVId1i
zk%*KXODVFjKv~Jw#!6W}DK?~}Y$R4F3Q<yo6eUXjp5K|7V}3Jl?s%7)Zt8yO<U8k{
zJ9o~wf6nwm0DxqFmIVI$XVD3$Mkk;eoq%d|0;<sos75ECnqMVQQ&R(fb8~aBy1ELb
zrKRlkr?9XP#>U2AZEXz>4h~>vX9uFuD0FsqLO2}esNZ9h(^6JcRD?7zIvE`u6~=y9
zS63H4K0b1^m+kFsEGQ@t_LVfD(`89XNjNk#gbxo7JnVnQ$H#?z3~Ov`#P|1ij`U}5
zZx17pi0~c~CUn|XTwIKQ`}_Mmlo!7Ql9QA1{QR7w5HBt+u&JrZe9-*-e4Ln=z|YT5
zZbcj!84=z`!h}xS1_lOr2#ckqCD&W^OQ5^En<EfEK0dIjs>%~HGc&^xh&MMkn3$O8
ziIFg&(>7Y9czu11r>Cdb($a#VPzYaMUU*pl1Qr$+I0BItuP~;6tgMV9Eb8j&gmK?l
z++Bzs9B3K=4F=20%j}I$b#*l>fc5otR&GvCPT=zLlCRu-WRcoNX|4jjAij!EdU`t0
zj>T61$H&L4yg1v8m-JHtImq(z@>p5i-rlnE;%uYE%}Sm?5=co&VP*0B{LIRWvn@3>
zm6be!BoGTNd{*Co^OI@%MIZ@0Jw36qNJ~p&<;B?++fRl-5-{eq^KDY8z{-oWjkar6
z@&uBAF|X+q<|}~m@^V&gjH%^pJ3KsOB~M^$U~_Ym6+lBn11mQb6&0=>%h^Ykz!IR7
zm=!>6ZLMjs3=a>p0ysN6gWcU-Q&aH>R0u+SeLW;3#D7G8`&bs4Q996#u%n~HG^*k8
z?d{Dt`Az2M=k2!U=4PZV)a*xfKGKxnD67_KYiq;I%uFmPDZ#0!DQ>ao>+7?}r0)#&
zB2G_F+kPJtI&JIe>ET<+F*`eJ_oWXXSKZ{t#>R$S$Yp0|v)AJ8?#{lS$m0HgGBPq)
z$&r<n#R_15YikSI+uPy({+>Nvj5?{cwH2tsHLvNL1Fo*FOl@#<bi_(b+#fiM)3Lw5
zA98bZ+2fC~`%sAtRQt2XA}1#YdV70;s!j9r^7ZxAtbrC67hz>(#dCmFR#w8`;Gh{d
zIXUUt(PGiR(5OZypc<WkYIFjs(Fv$VC!iXgfLZ_+{sDC8LK*_S@ge{K002ovPDHLk
FV1gQc#x(!{

diff --git a/tools/walletextension/frontend/src/components/providers/wallet-provider.tsx b/tools/walletextension/frontend/src/components/providers/wallet-provider.tsx
index 22da64e2ab..81ab3481ba 100644
--- a/tools/walletextension/frontend/src/components/providers/wallet-provider.tsx
+++ b/tools/walletextension/frontend/src/components/providers/wallet-provider.tsx
@@ -67,9 +67,9 @@ export const WalletConnectionProvider = ({
       setVersion(await fetchVersion());
     } catch (error) {
       showToast(
-        ToastType.DESTRUCTIVE,
-        "Error initializing wallet connection. Please refresh the page."
-      );
+          ToastType.DESTRUCTIVE,
+      error instanceof Error ? error.message : "Error initializing wallet connection. Please refresh the page."
+    );
     } finally {
       setLoading(false);
     }
diff --git a/tools/walletextension/frontend/src/services/ethService.ts b/tools/walletextension/frontend/src/services/ethService.ts
index e5a8bcebe6..48993e9237 100644
--- a/tools/walletextension/frontend/src/services/ethService.ts
+++ b/tools/walletextension/frontend/src/services/ethService.ts
@@ -14,6 +14,23 @@ const ethService = {
   checkIfMetamaskIsLoaded: async (provider: ethers.providers.Web3Provider) => {
     try {
       if (ethereum) {
+
+        // There are some wallets that are conflicting with MetaMask - we want to check that and throw an error if they are connected
+        const conflictingWalletMap = {
+          'Exodus Wallet': ethereum.isExodus,
+          'Nest Wallet': ethereum.isNestWallet,
+          // Add other wallets here as needed
+        };
+
+        // Iterate over the wallet map and handle conflicts
+        for (const [walletName, isWalletConnected] of Object.entries(conflictingWalletMap)) {
+          if (isWalletConnected) {
+            const message = `${walletName} is connected and is conflicting with MetaMask. Please disable ${walletName} and try again.`;
+            showToast(ToastType.DESTRUCTIVE, message);
+            throw new Error(message);
+          }
+        }
+
         return await ethService.handleEthereum(provider);
       } else {
         showToast(ToastType.INFO, "Connecting to MetaMask...");