Merge branch 'main' into STAKE-874-hide-0-staked-balances-on-homepage…

…-when-user-has-no-positions-or-never-staked-before
MetaMask · Nov 19, 2024 · 428d42f · 428d42f
2 parents 47130a5 + 35212ec
commit 428d42f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/util/sentry/tags/index.ts b/app/util/sentry/tags/index.ts
@@ -13,6 +13,7 @@ export function getTraceTags(state: RootState) {
   if (!state?.engine?.backgroundState?.TokensController) return;
   if (!state?.engine?.backgroundState?.TransactionController) return;
   if (!state?.engine?.backgroundState?.NotificationServicesController) return;
+  if (!state?.engine?.backgroundState?.ApprovalController) return;
   if (!Object.keys(state?.engine?.backgroundState).length) return;
 
   const unlocked = state.user.userLoggedIn;
@@ -21,9 +22,10 @@ export function getTraceTags(state: RootState) {
   const notificationCount = getNotificationsList(state).length;
   const tokenCount = selectAllTokensFlat(state).length;
   const transactionCount = selectTransactions(state).length;
-  const pendingApprovals = Object.values(selectPendingApprovals(state));
+  const pendingApprovals = selectPendingApprovals(state);
+  const pendingApprovalsValues = Object.values(pendingApprovals ?? {});
 
-  const firstApprovalType = pendingApprovals?.[0]?.type;
+  const firstApprovalType = pendingApprovalsValues?.[0]?.type;
 
   return {
     'wallet.account_count': accountCount,