Merge pull request #399 from ergolabs/dev

v1.2.8
spectrum-finance · Feb 16, 2022 · dded0ed · dded0ed
2 parents 058f06a + 243dae3
commit dded0ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/components/common/ConnectWalletButton/ChooseWalletModal/ChooseWalletModal.tsx b/src/components/common/ConnectWalletButton/ChooseWalletModal/ChooseWalletModal.tsx
@@ -76,7 +76,7 @@ const ChooseWalletModal: React.FC<ChooseWalletModalProps> = ({
 
   const handleWalletClick = (wallet: Wallet) => {
     connectWallet(wallet).subscribe(
-      () => close(true),
+      (isConnected) => isConnected && close(true),
       () => window.open(wallet.extensionLink),
     );
   };

diff --git a/src/network/ergo/wallets/NautilusWallet.tsx b/src/network/ergo/wallets/NautilusWallet.tsx
@@ -11,7 +11,7 @@ const connectWallet = (): Observable<any> => {
   }
   return from(ergoConnector.nautilus.connect()).pipe(
     tap(() => (window.nautilus = Object.freeze(new NautilusErgoApi()))),
-    catchError(() => of(true)),
+    catchError(() => of(false)),
   );
 };
 

diff --git a/src/network/ergo/wallets/index.ts b/src/network/ergo/wallets/index.ts
@@ -39,7 +39,11 @@ export const connectWallet = (wallet: Wallet): Observable<any> => {
 
   if (connectedWalletName) {
     return combineLatest([wallet.connectWallet(), selectedWallet$]).pipe(
-      tap(([, selectedWallet]) => {
+      tap(([isConnected, selectedWallet]) => {
+        if (!isConnected) {
+          return;
+        }
+
         if (selectedWallet?.onDisconnect) {
           selectedWallet.onDisconnect();
         }
@@ -52,9 +56,11 @@ export const connectWallet = (wallet: Wallet): Observable<any> => {
 
   updateSelectedWallet$.next(undefined);
   return wallet.connectWallet().pipe(
-    tap(() => {
-      walletSettings.setConnected(wallet.name);
-      updateSelectedWallet$.next(wallet.name);
+    tap((isConnected) => {
+      if (isConnected) {
+        walletSettings.setConnected(wallet.name);
+        updateSelectedWallet$.next(wallet.name);
+      }
     }),
   );
 };