refactor function usage

MetaMask · Aug 16, 2024 · 6d498e1 · 6d498e1
1 parent 32d53c0
commit 6d498e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/app/components/Views/Settings/NotificationsSettings/index.tsx b/app/components/Views/Settings/NotificationsSettings/index.tsx
@@ -26,7 +26,10 @@ import { NotificationsToggleTypes } from './NotificationsSettings.constants';
 
 import { selectIsMetamaskNotificationsEnabled } from '../../../../selectors/notifications';
 
-import { requestPushNotificationsPermission } from '../../../../util/notifications';
+import {
+  requestPushNotificationsPermission,
+  asyncAlert,
+} from '../../../../util/notifications';
 import Routes from '../../../../constants/navigation/Routes';
 import { IconName } from '../../../../component-library/components/Icons/Icon';
 import ButtonIcon, {
@@ -83,8 +86,9 @@ const NotificationsSettings = ({ navigation, route }: Props) => {
 
   const toggleNotificationsEnabled = async () => {
     if (!isMetamaskNotificationsEnabled) {
-      const nativeNotificationStatus =
-        await requestPushNotificationsPermission();
+      const nativeNotificationStatus = await requestPushNotificationsPermission(
+        asyncAlert,
+      );
 
       if (nativeNotificationStatus) {
         await enableNotifications();

diff --git a/app/core/NotificationManager.js b/app/core/NotificationManager.js
@@ -12,6 +12,7 @@ import {
   NotificationTransactionTypes,
   isNotificationsFeatureEnabled,
   requestPushNotificationsPermission,
+  asyncAlert,
 } from '../util/notifications';
 import { safeToChecksumAddress } from '../util/address';
 import ReviewManager from './ReviewManager';
@@ -253,7 +254,7 @@ class NotificationManager {
 
         Device.isIos() &&
           setTimeout(() => {
-            requestPushNotificationsPermission();
+            requestPushNotificationsPermission(asyncAlert);
           }, 5000);
 
         // Prompt review
@@ -428,9 +429,9 @@ class NotificationManager {
         .filter(
           (tx) =>
             safeToChecksumAddress(tx.txParams?.to) ===
-              selectedInternalAccountChecksummedAddress &&
+            selectedInternalAccountChecksummedAddress &&
             safeToChecksumAddress(tx.txParams?.from) !==
-              selectedInternalAccountChecksummedAddress &&
+            selectedInternalAccountChecksummedAddress &&
             tx.chainId === chainId &&
             tx.status === 'confirmed' &&
             lastBlock <= parseInt(tx.blockNumber, 10) &&
@@ -487,7 +488,7 @@ export default {
     return instance?.gotIncomingTransaction(lastBlock);
   },
   requestPushNotificationsPermission() {
-    return instance?.requestPushNotificationsPermission();
+    return instance?.requestPushNotificationsPermission(asyncAlert);
   },
   showSimpleNotification(data) {
     return instance?.showSimpleNotification(data);