feat: improve ledger simulator

radixdlt · May 26, 2023 · 1c04f86 · 1c04f86
1 parent 3913f8d
commit 1c04f86
Show file tree

Hide file tree

Showing 5 changed files with 310 additions and 225 deletions.
diff --git a/src/chrome/background/ledger-tab-watcher.ts b/src/chrome/background/ledger-tab-watcher.ts
@@ -5,6 +5,7 @@ export const LedgerTabWatcher = () => {
   let tabId: number | undefined
   let messageId: string | undefined
   return {
+    getCurrentlyWatched: () => ({ tabId, messageId }),
     setWatchedTab: (_tabId: number, _messageId: string) => {
       tabId = _tabId
       messageId = _messageId

diff --git a/src/chrome/background/message-handler.ts b/src/chrome/background/message-handler.ts
@@ -1,6 +1,6 @@
 import { closePopup as closePopupFn } from 'chrome/helpers/close-popup'
 import { openParingPopup as openParingPopupFn } from 'chrome/helpers/open-pairing-popup'
-import { errAsync, ResultAsync } from 'neverthrow'
+import { errAsync, okAsync, ResultAsync } from 'neverthrow'
 import { AppLogger } from 'utils/logger'
 import {
   messageDiscriminator,
@@ -85,6 +85,16 @@ export const BackgroundMessageHandler =
           .mapErr(() => ({ reason: 'failedToOpenLedgerTab' }))
       }
 
+      case messageDiscriminator.closeLedgerTab: {
+        const { tabId } = ledgerTabWatcher?.getCurrentlyWatched() ?? {}
+        ledgerTabWatcher?.restoreInitial()
+        return tabId
+          ? ResultAsync.fromSafePromise(chrome.tabs.remove(tabId)).map(() => ({
+              sendConfirmation: false,
+            }))
+          : okAsync({ sendConfirmation: false })
+      }
+
       case messageDiscriminator.walletToLedger:
         ledgerTabWatcher?.restoreInitial()
         return createAlignedPopupWindow(config.popup.pages.ledger)