Update route guard (#811)

penumbra-zone · Mar 21, 2024 · dd78a89 · dd78a89
1 parent 4ed02a1
commit dd78a89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/apps/extension/src/entry/popup-root.tsx b/apps/extension/src/entry/popup-root.tsx
@@ -18,11 +18,13 @@ chrome.runtime.onMessage.addListener(
   (req: unknown, _: chrome.runtime.MessageSender, responder: (x: unknown) => void) => {
     if (isPopupRequest(req)) {
       try {
-        if (isTxApprovalRequest(req))
+        if (isTxApprovalRequest(req)) {
           void txApprovalSelector(useStore.getState()).acceptRequest(req, responder);
-        else if (isOriginApprovalRequest(req))
+        } else if (isOriginApprovalRequest(req)) {
           originApprovalSelector(useStore.getState()).acceptRequest(req, responder);
-        else throw new Error('Unknown popup request');
+        } else {
+          throw new Error('Unknown popup request');
+        }
       } catch (e) {
         responder({
           type: req.type,

diff --git a/apps/extension/src/message/popup.ts b/apps/extension/src/message/popup.ts
@@ -46,7 +46,4 @@ export const isOriginApprovalRequest = (req: unknown): req is InternalRequest<Or
   isPopupRequest(req) && req.type === PopupType.OriginApproval && 'origin' in req.request;
 
 export const isTxApprovalRequest = (req: unknown): req is InternalRequest<TxApproval> =>
-  isPopupRequest(req) &&
-  req.type === PopupType.TxApproval &&
-  'authorizeRequest' in req.request &&
-  'transactionView' in req.request;
+  isPopupRequest(req) && req.type === PopupType.TxApproval && 'authorizeRequest' in req.request;
diff --git a/apps/extension/src/state/tx-approval.ts b/apps/extension/src/state/tx-approval.ts
@@ -69,10 +69,13 @@ export const createTxApprovalSlice = (): SliceCreator<TxApprovalSlice> => (set,
       return denomMetadata ?? new Metadata();
     };
 
+    const wallets = await localExtStorage.get('wallets');
+    const activeWalletFvk = wallets[0]?.fullViewingKey ?? '';
+
     const transactionView = await viewTransactionPlan(
       authorizeRequest.plan ?? new TransactionPlan(),
       getMetadata,
-      (await localExtStorage.get('wallets'))[0]?.fullViewingKey ?? '',
+      activeWalletFvk,
     );
 
     // pregenerate views from various perspectives.