Skip to content

Commit 7969aa6

Browse files
committed
Opt-out confirm alert files
1 parent 01094ea commit 7969aa6

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

ui/pages/confirmations/confirmation/alerts/TemplateAlertContext.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use no memo';
2+
13
import React, {
24
ReactElement,
35
createContext,
@@ -36,7 +38,7 @@ export const TemplateAlertContextProvider: React.FC<{
3638
const pendingConfirmation =
3739
pendingConfirmations?.find(
3840
(confirmation) => confirmation.id === confirmationId,
39-
) ?? pendingConfirmations?.[0];
41+
) ?? pendingConfirmations[0];
4042

4143
const [isAlertsModalVisible, setIsAlertsModalVisible] = useState(false);
4244
const alertOwnerId = pendingConfirmation?.id;

ui/pages/confirmations/confirmation/alerts/useAlertsActions.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use no memo';
2+
13
import { ApprovalRequest } from '@metamask/approval-controller';
24
import { useCallback } from 'react';
35
import { useSelector } from 'react-redux';
@@ -11,17 +13,19 @@ import {
1113

1214
export const useAlertsActions = (
1315
hideAlertModal: () => void,
14-
pendingConfirmation: ApprovalRequest<{ id: string }> | undefined,
16+
pendingConfirmation: ApprovalRequest<{ id: string }>,
1517
) => {
16-
const { origin } = pendingConfirmation ?? {};
1718
const pendingConfirmationsFromOrigin = useSelector((state) =>
18-
getApprovalsByOrigin(state as ApprovalsMetaMaskState, origin as string),
19+
getApprovalsByOrigin(
20+
state as ApprovalsMetaMaskState,
21+
pendingConfirmation?.origin,
22+
),
1923
);
2024

2125
const { getIndex, navigateToIndex } = useConfirmationNavigation();
2226

2327
const navigateToPendingConfirmation = useCallback(() => {
24-
const { id } = pendingConfirmation ?? {};
28+
const { id } = pendingConfirmation;
2529
const pendingConfirmations = pendingConfirmationsFromOrigin?.filter(
2630
(confirmation) => confirmation.id !== id,
2731
);

ui/pages/confirmations/confirmation/alerts/useTemplateConfirmationAlerts.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use no memo';
2+
13
import { ApprovalRequest } from '@metamask/approval-controller';
24
import { useDispatch } from 'react-redux';
35
import { useEffect, useMemo } from 'react';
@@ -10,7 +12,7 @@ import {
1012
import { useUpdateEthereumChainAlerts } from './useUpdateEthereumChainAlerts';
1113

1214
export const useTemplateConfirmationAlerts = (
13-
pendingConfirmation: ApprovalRequest<{ id: string }> | undefined,
15+
pendingConfirmation: ApprovalRequest<{ id: string }>,
1416
) => {
1517
const dispatch = useDispatch();
1618
const addEthereumChainAlerts =

ui/pages/confirmations/confirmation/alerts/useUpdateEthereumChainAlerts.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use no memo';
2+
13
import { ApprovalRequest } from '@metamask/approval-controller';
24
import { ApprovalType } from '@metamask/controller-utils';
35
import { Json } from '@metamask/utils';
@@ -19,7 +21,7 @@ const VALIDATED_APPROVAL_TYPES = [
1921
];
2022

2123
export function useUpdateEthereumChainAlerts(
22-
pendingConfirmation: ApprovalRequest<Record<string, Json>> | undefined,
24+
pendingConfirmation: ApprovalRequest<Record<string, Json>>,
2325
): Alert[] {
2426
const pendingConfirmationsFromOrigin = useSelector((state) =>
2527
getApprovalsByOrigin(
@@ -33,7 +35,7 @@ export function useUpdateEthereumChainAlerts(
3335
if (
3436
pendingConfirmationsFromOrigin?.length <= 1 ||
3537
(!VALIDATED_APPROVAL_TYPES.includes(
36-
pendingConfirmation?.type as ApprovalType,
38+
pendingConfirmation.type as ApprovalType,
3739
) &&
3840
(pendingConfirmation?.requestData?.metadata as Record<string, boolean>)
3941
?.isSwitchEthereumChain !== true)
@@ -51,7 +53,7 @@ export function useUpdateEthereumChainAlerts(
5153
],
5254
key: 'pendingConfirmationFromSameOrigin',
5355
message: t(
54-
pendingConfirmation?.type === ApprovalType.AddEthereumChain
56+
pendingConfirmation.type === ApprovalType.AddEthereumChain
5557
? 'pendingConfirmationAddNetworkAlertMessage'
5658
: 'pendingConfirmationSwitchNetworkAlertMessage',
5759
[pendingConfirmationsFromOrigin.length - 1],

0 commit comments

Comments
 (0)