diff --git a/android/.gradle/7.5.1/checksums/checksums.lock b/android/.gradle/7.5.1/checksums/checksums.lock
index a2e0c98e..9396c0b5 100644
Binary files a/android/.gradle/7.5.1/checksums/checksums.lock and b/android/.gradle/7.5.1/checksums/checksums.lock differ
diff --git a/android/.gradle/7.5.1/checksums/md5-checksums.bin b/android/.gradle/7.5.1/checksums/md5-checksums.bin
index 9be241f5..2931c86d 100644
Binary files a/android/.gradle/7.5.1/checksums/md5-checksums.bin and b/android/.gradle/7.5.1/checksums/md5-checksums.bin differ
diff --git a/android/.gradle/7.5.1/checksums/sha1-checksums.bin b/android/.gradle/7.5.1/checksums/sha1-checksums.bin
index 08681c98..d8a61855 100644
Binary files a/android/.gradle/7.5.1/checksums/sha1-checksums.bin and b/android/.gradle/7.5.1/checksums/sha1-checksums.bin differ
diff --git a/android/.gradle/7.5.1/executionHistory/executionHistory.bin b/android/.gradle/7.5.1/executionHistory/executionHistory.bin
index 5ce704a2..b6ccb598 100644
Binary files a/android/.gradle/7.5.1/executionHistory/executionHistory.bin and b/android/.gradle/7.5.1/executionHistory/executionHistory.bin differ
diff --git a/android/.gradle/7.5.1/executionHistory/executionHistory.lock b/android/.gradle/7.5.1/executionHistory/executionHistory.lock
index 2245057a..48f69409 100644
Binary files a/android/.gradle/7.5.1/executionHistory/executionHistory.lock and b/android/.gradle/7.5.1/executionHistory/executionHistory.lock differ
diff --git a/android/.gradle/7.5.1/fileHashes/fileHashes.bin b/android/.gradle/7.5.1/fileHashes/fileHashes.bin
index 0395d896..c4fccb29 100644
Binary files a/android/.gradle/7.5.1/fileHashes/fileHashes.bin and b/android/.gradle/7.5.1/fileHashes/fileHashes.bin differ
diff --git a/android/.gradle/7.5.1/fileHashes/fileHashes.lock b/android/.gradle/7.5.1/fileHashes/fileHashes.lock
index e85598c9..4d9c126c 100644
Binary files a/android/.gradle/7.5.1/fileHashes/fileHashes.lock and b/android/.gradle/7.5.1/fileHashes/fileHashes.lock differ
diff --git a/android/.gradle/7.5.1/fileHashes/resourceHashesCache.bin b/android/.gradle/7.5.1/fileHashes/resourceHashesCache.bin
index 9ac1c930..e2da4c7d 100644
Binary files a/android/.gradle/7.5.1/fileHashes/resourceHashesCache.bin and b/android/.gradle/7.5.1/fileHashes/resourceHashesCache.bin differ
diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 5543c631..d8697a58 100644
Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/android/.gradle/buildOutputCleanup/outputFiles.bin b/android/.gradle/buildOutputCleanup/outputFiles.bin
index 0b09f786..f1207ce4 100644
Binary files a/android/.gradle/buildOutputCleanup/outputFiles.bin and b/android/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/android/.gradle/file-system.probe b/android/.gradle/file-system.probe
index 4f6790e4..63a6c2e4 100644
Binary files a/android/.gradle/file-system.probe and b/android/.gradle/file-system.probe differ
diff --git a/android/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NDLijDKD7QtJwkHY7mvcct+I6eQ= b/android/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NDLijDKD7QtJwkHY7mvcct+I6eQ=
index e0f16d74..1220dcbc 100644
Binary files a/android/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NDLijDKD7QtJwkHY7mvcct+I6eQ= and b/android/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NDLijDKD7QtJwkHY7mvcct+I6eQ= differ
diff --git a/android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
index 4366f25f..af0bf7e5 100644
--- a/android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@@ -1,4 +1,4 @@
-#Thu Apr 17 13:05:36 SGT 2025
+#Tue Apr 29 18:51:22 SGT 2025
 com.project.yondu.unioilloyaltyapp-main-49\:/drawable-mdpi/node_modules_reactnative_libraries_logbox_ui_logboximages_chevronleft.png=C\:\\Users\\lenovo\\unioil-loyalty-rn-app-ios-and-android\\android\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_node_modules_reactnative_libraries_logbox_ui_logboximages_chevronleft.png.flat
 com.project.yondu.unioilloyaltyapp-main-49\:/drawable-mdpi/app_assets_img_bg_about.png=C\:\\Users\\lenovo\\unioil-loyalty-rn-app-ios-and-android\\android\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_app_assets_img_bg_about.png.flat
 com.project.yondu.unioilloyaltyapp-main-49\:/drawable-mdpi/app_assets_bg_xavier.png=C\:\\Users\\lenovo\\unioil-loyalty-rn-app-ios-and-android\\android\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_app_assets_bg_xavier.png.flat
diff --git a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
index b6bbafcc..67a3198d 100644
--- a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Thu Apr 17 13:31:31 SGT 2025
+#Tue Apr 29 19:01:35 SGT 2025
 path.4=15/classes.dex
 path.3=14/classes.dex
 path.2=0/classes.dex
diff --git a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
index a5cbc61a..eb6cd9fc 100644
Binary files a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources differ
diff --git a/android/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/android/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
index 5313c2c0..b03f5585 100644
--- a/android/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
+++ b/android/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -32,59 +32,61 @@
 18    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 18-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:10:5-76
 18-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:10:22-73
-19
-20    <queries>
-20-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:42:5-51:15
-21        <intent>
-21-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:43:7-46:16
-22            <action android:name="android.intent.action.VIEW" />
-22-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:9-61
-22-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:17-58
-23
-24            <data android:scheme="tel" />
-24-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:9-38
-24-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:15-35
-25        </intent>
-26        <intent>
-26-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:47:7-50:16
-27            <action android:name="android.intent.action.VIEW" />
-27-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:9-61
-27-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:17-58
-28
-29            <data android:scheme="market" />
-29-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:9-38
-29-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:15-35
-30        </intent>
-31        <intent>
-31-->[:react-native-email-link] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-email-link\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:8:9-12:18
-32            <action android:name="android.intent.action.VIEW" />
-32-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:9-61
-32-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:17-58
-33
-34            <data android:scheme="mailto" />
-34-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:9-38
-34-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:15-35
-35        </intent> <!-- Query Camera Packages -->
-36        <intent>
-36-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:12:9-14:18
-37            <action android:name="android.media.action.IMAGE_CAPTURE" />
-37-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:13:13-73
-37-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:13:21-70
-38        </intent> <!-- Query Open Document -->
-39        <intent>
-39-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:16:9-18:18
-40            <action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />
-40-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:17:13-79
-40-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:17:21-76
-41        </intent> <!-- Needs to be explicitly declared on Android R+ -->
-42        <package android:name="com.google.android.apps.maps" />
-42-->[com.google.android.gms:play-services-maps:18.0.2] C:\Users\lenovo\.gradle\caches\transforms-3\138f60292f4635808fad671641391273\transformed\jetified-play-services-maps-18.0.2\AndroidManifest.xml:33:9-64
-42-->[com.google.android.gms:play-services-maps:18.0.2] C:\Users\lenovo\.gradle\caches\transforms-3\138f60292f4635808fad671641391273\transformed\jetified-play-services-maps-18.0.2\AndroidManifest.xml:33:18-61
-43    </queries>
-44
-45    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-45-->[com.facebook.flipper:flipper:0.182.0] C:\Users\lenovo\.gradle\caches\transforms-3\33de6d1452d2110d7085c31c0539f1a9\transformed\jetified-flipper-0.182.0\AndroidManifest.xml:16:5-76
-45-->[com.facebook.flipper:flipper:0.182.0] C:\Users\lenovo\.gradle\caches\transforms-3\33de6d1452d2110d7085c31c0539f1a9\transformed\jetified-flipper-0.182.0\AndroidManifest.xml:16:22-73
+19    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+19-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:11:5-75
+19-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:11:22-73
+20    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+20-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:9:5-79
+20-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:9:22-76
+21
+22    <queries>
+22-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:43:5-52:15
+23        <intent>
+23-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:7-47:16
+24            <action android:name="android.intent.action.VIEW" />
+24-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:9-61
+24-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:17-58
+25
+26            <data android:scheme="tel" />
+26-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:46:9-38
+26-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:46:15-35
+27        </intent>
+28        <intent>
+28-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:48:7-51:16
+29            <action android:name="android.intent.action.VIEW" />
+29-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:9-61
+29-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:17-58
+30
+31            <data android:scheme="market" />
+31-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:46:9-38
+31-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:46:15-35
+32        </intent>
+33        <intent>
+33-->[:react-native-email-link] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-email-link\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:8:9-12:18
+34            <action android:name="android.intent.action.VIEW" />
+34-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:9-61
+34-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:17-58
+35
+36            <data android:scheme="mailto" />
+36-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:46:9-38
+36-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:46:15-35
+37        </intent> <!-- Query Camera Packages -->
+38        <intent>
+38-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:12:9-14:18
+39            <action android:name="android.media.action.IMAGE_CAPTURE" />
+39-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:13:13-73
+39-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:13:21-70
+40        </intent> <!-- Query Open Document -->
+41        <intent>
+41-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:16:9-18:18
+42            <action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />
+42-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:17:13-79
+42-->[com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:17:21-76
+43        </intent> <!-- Needs to be explicitly declared on Android R+ -->
+44        <package android:name="com.google.android.apps.maps" />
+44-->[com.google.android.gms:play-services-maps:18.0.2] C:\Users\lenovo\.gradle\caches\transforms-3\138f60292f4635808fad671641391273\transformed\jetified-play-services-maps-18.0.2\AndroidManifest.xml:33:9-64
+44-->[com.google.android.gms:play-services-maps:18.0.2] C:\Users\lenovo\.gradle\caches\transforms-3\138f60292f4635808fad671641391273\transformed\jetified-play-services-maps-18.0.2\AndroidManifest.xml:33:18-61
+45    </queries>
 46    <!--
 47         Required to keep CPU alive while downloading files
 48        (NOT to keep screen awake)
@@ -193,79 +195,79 @@
 91-->[me.leolin:ShortcutBadger:1.1.22] C:\Users\lenovo\.gradle\caches\transforms-3\0d515e15312d85521d8e2eea8ca91d26\transformed\jetified-ShortcutBadger-1.1.22\AndroidManifest.xml:50:22-86
 92
 93    <application
-93-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:12:5-41:19
+93-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:13:5-42:19
 94        android:name="com.project.yondu.unioilloyaltyapp.MainApplication"
-94-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:13:7-38
+94-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:14:7-38
 95        android:allowBackup="false"
-95-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:17:7-34
+95-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:18:7-34
 96        android:appComponentFactory="androidx.core.app.CoreComponentFactory"
 96-->[androidx.core:core:1.9.0] C:\Users\lenovo\.gradle\caches\transforms-3\b4c3f05e3257a2e8aed1c5e14e6024dd\transformed\core-1.9.0\AndroidManifest.xml:28:18-86
 97        android:debuggable="true"
 98        android:icon="@mipmap/ic_launcher"
-98-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:15:7-41
+98-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:16:7-41
 99        android:label="@string/app_name"
-99-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:14:7-39
+99-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:15:7-39
 100        android:roundIcon="@mipmap/ic_launcher_round"
-100-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:16:7-52
+100-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:17:7-52
 101        android:theme="@style/AppTheme"
-101-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:19:7-38
+101-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:20:7-38
 102        android:usesCleartextTraffic="true" >
-102-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:18:7-42
+102-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:19:7-42
 103        <meta-data
-103-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:20:7-22:66
+103-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:21:7-23:66
 104            android:name="com.google.android.geo.API_KEY"
-104-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:21:9-54
+104-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:22:9-54
 105            android:value="AIzaSyBP2Wggw7JgFQESnqvwh74NDohBPgF9tkM" />
-105-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:22:9-64
+105-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:23:9-64
 106
 107        <activity
-107-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:23:7-34:18
+107-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:24:7-35:18
 108            android:name="com.project.yondu.unioilloyaltyapp.MainActivity"
-108-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:24:9-37
+108-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:25:9-37
 109            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-109-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:27:9-86
+109-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:28:9-86
 110            android:exported="true"
-110-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:26:9-32
+110-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:27:9-32
 111            android:label="@string/app_name"
-111-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:25:9-41
+111-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:26:9-41
 112            android:launchMode="singleTask"
-112-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:28:9-40
+112-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:29:9-40
 113            android:windowSoftInputMode="adjustPan" >
-113-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:29:9-48
+113-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:30:9-48
 114            <intent-filter>
-114-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:30:9-33:25
+114-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:31:9-34:25
 115                <action android:name="android.intent.action.MAIN" />
-115-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:31:13-65
-115-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:31:21-62
+115-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:32:13-65
+115-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:32:21-62
 116
 117                <category android:name="android.intent.category.LAUNCHER" />
-117-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:32:13-73
-117-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:32:23-70
+117-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:33:13-73
+117-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:33:23-70
 118            </intent-filter>
 119        </activity>
 120        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-120-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:35:7-84
-120-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:35:17-81
+120-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:7-84
+120-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:17-81
 121
 122        <uses-library
-122-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:7-85
+122-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:37:7-85
 123            android:name="org.apache.http.legacy"
-123-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:21-58
+123-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:37:21-58
 124            android:required="false" />
-124-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:59-83
+124-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:37:59-83
 125
 126        <service
-126-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:38:7-163
+126-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:7-163
 127            android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver"
-127-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:38:16-112
+127-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:16-112
 128            android:foregroundServiceType="remoteMessaging" />
-128-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:38:113-160
+128-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:113-160
 129        <service
-129-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:7-110
+129-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:40:7-110
 130            android:name="com.google.android.gms.maps.MapView"
-130-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:16-66
+130-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:40:16-66
 131            android:foregroundServiceType="location" />
-131-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:67-107
+131-->C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:40:67-107
 132
 133        <provider
 133-->[:react-native-blob-util] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:35:9-43:20
diff --git a/android/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/android/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
index ba13d03b..79191c4b 100644
--- a/android/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
+++ b/android/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml
@@ -16,6 +16,8 @@
     <uses-permission android:name="android     .permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <queries>
         <intent>
@@ -41,8 +43,6 @@
         </intent> <!-- Needs to be explicitly declared on Android R+ -->
         <package android:name="com.google.android.apps.maps" />
     </queries>
-
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!--
          Required to keep CPU alive while downloading files
         (NOT to keep screen awake)
diff --git a/android/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/android/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
index ba13d03b..79191c4b 100644
--- a/android/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
+++ b/android/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -16,6 +16,8 @@
     <uses-permission android:name="android     .permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <queries>
         <intent>
@@ -41,8 +43,6 @@
         </intent> <!-- Needs to be explicitly declared on Android R+ -->
         <package android:name="com.google.android.apps.maps" />
     </queries>
-
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!--
          Required to keep CPU alive while downloading files
         (NOT to keep screen awake)
diff --git a/android/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml b/android/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
index ba13d03b..79191c4b 100644
--- a/android/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
+++ b/android/app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml
@@ -16,6 +16,8 @@
     <uses-permission android:name="android     .permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <queries>
         <intent>
@@ -41,8 +43,6 @@
         </intent> <!-- Needs to be explicitly declared on Android R+ -->
         <package android:name="com.google.android.apps.maps" />
     </queries>
-
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!--
          Required to keep CPU alive while downloading files
         (NOT to keep screen awake)
diff --git a/android/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/android/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
index 4894c8bc..0b60ba9a 100644
Binary files a/android/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and b/android/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ differ
diff --git a/android/app/build/outputs/apk/debug/app-debug.apk b/android/app/build/outputs/apk/debug/app-debug.apk
index c2cd4859..3a5b3025 100644
Binary files a/android/app/build/outputs/apk/debug/app-debug.apk and b/android/app/build/outputs/apk/debug/app-debug.apk differ
diff --git a/android/app/build/outputs/logs/manifest-merger-debug-report.txt b/android/app/build/outputs/logs/manifest-merger-debug-report.txt
index fd8f094a..1e3a750d 100644
--- a/android/app/build/outputs/logs/manifest-merger-debug-report.txt
+++ b/android/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,10 +1,10 @@
 -- Merging decision tree log ---
 manifest
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-52:12
-INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-52:12
-INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-52:12
-INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-52:12
-MERGED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-52:12
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-53:12
+INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-53:12
+INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-53:12
+INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-53:12
+MERGED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-53:12
 MERGED from [com.facebook.flipper:flipper-network-plugin:0.182.0] C:\Users\lenovo\.gradle\caches\transforms-3\f8f43acd480be655f619033020e35c1b\transformed\jetified-flipper-network-plugin-0.182.0\AndroidManifest.xml:8:1-15:12
 MERGED from [com.facebook.flipper:flipper-fresco-plugin:0.182.0] C:\Users\lenovo\.gradle\caches\transforms-3\c7732b2ef3e5747df9fde66432dcd645\transformed\jetified-flipper-fresco-plugin-0.182.0\AndroidManifest.xml:8:1-15:12
 MERGED from [com.facebook.flipper:flipper:0.182.0] C:\Users\lenovo\.gradle\caches\transforms-3\33de6d1452d2110d7085c31c0539f1a9\transformed\jetified-flipper-0.182.0\AndroidManifest.xml:8:1-18:12
@@ -154,17 +154,17 @@ INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\
 INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\AndroidManifest.xml:2:1-8:12
 	package
 		INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-52:12
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-53:12
 		INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\AndroidManifest.xml
 	android:versionName
 		INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-52:12
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-53:12
 		INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\AndroidManifest.xml
 	xmlns:tools
 		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\AndroidManifest.xml:3:5-51
 	android:versionCode
 		INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-52:12
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:1-53:12
 		INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\AndroidManifest.xml
 	xmlns:android
 		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:1:11-69
@@ -254,10 +254,20 @@ uses-permission#android.permission.READ_MEDIA_IMAGES
 ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:10:5-76
 	android:name
 		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:10:22-73
+uses-permission#android.permission.ACCESS_WIFI_STATE
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:11:5-75
+MERGED from [com.facebook.flipper:flipper:0.182.0] C:\Users\lenovo\.gradle\caches\transforms-3\33de6d1452d2110d7085c31c0539f1a9\transformed\jetified-flipper-0.182.0\AndroidManifest.xml:16:5-76
+MERGED from [com.facebook.flipper:flipper:0.182.0] C:\Users\lenovo\.gradle\caches\transforms-3\33de6d1452d2110d7085c31c0539f1a9\transformed\jetified-flipper-0.182.0\AndroidManifest.xml:16:5-76
+MERGED from [:react-native-blob-util] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:23:5-76
+MERGED from [:react-native-blob-util] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:23:5-76
+MERGED from [:react-native-community_netinfo] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\netinfo\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:8:5-76
+MERGED from [:react-native-community_netinfo] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\netinfo\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:8:5-76
+	android:name
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:11:22-73
 application
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:12:5-41:19
-MERGED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:12:5-41:19
-MERGED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:12:5-41:19
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:13:5-42:19
+MERGED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:13:5-42:19
+MERGED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:13:5-42:19
 MERGED from [:react-native-blob-util] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:34:5-44:19
 MERGED from [:react-native-blob-util] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:34:5-44:19
 MERGED from [:react-native-community_datetimepicker] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\datetimepicker\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:7:5-20
@@ -353,85 +363,85 @@ MERGED from [com.google.maps.android:android-maps-utils:3.4.0] C:\Users\lenovo\.
 	android:appComponentFactory
 		ADDED from [androidx.core:core:1.9.0] C:\Users\lenovo\.gradle\caches\transforms-3\b4c3f05e3257a2e8aed1c5e14e6024dd\transformed\core-1.9.0\AndroidManifest.xml:28:18-86
 	android:label
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:14:7-39
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:14:7-39
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:15:7-39
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:15:7-39
 	tools:ignore
 		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\AndroidManifest.xml:7:75-114
 	android:roundIcon
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:16:7-52
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:16:7-52
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:17:7-52
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:17:7-52
 	tools:targetApi
 		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\AndroidManifest.xml:7:54-74
 	android:icon
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:15:7-41
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:15:7-41
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:16:7-41
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:16:7-41
 	android:allowBackup
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:17:7-34
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:17:7-34
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:18:7-34
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:18:7-34
 	android:theme
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:19:7-38
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:19:7-38
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:20:7-38
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:20:7-38
 	android:usesCleartextTraffic
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:18:7-42
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:19:7-42
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:13:7-38
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:13:7-38
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:14:7-38
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:14:7-38
 meta-data#com.google.android.geo.API_KEY
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:20:7-22:66
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:21:7-23:66
 	android:value
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:22:9-64
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:23:9-64
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:21:9-54
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:22:9-54
 activity#com.project.yondu.unioilloyaltyapp.MainActivity
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:23:7-34:18
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:24:7-35:18
 	android:label
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:25:9-41
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:26:9-41
 	android:launchMode
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:28:9-40
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:29:9-40
 	android:windowSoftInputMode
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:29:9-48
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:30:9-48
 	android:exported
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:26:9-32
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:27:9-32
 	android:configChanges
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:27:9-86
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:28:9-86
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:24:9-37
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:25:9-37
 intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:30:9-33:25
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:31:9-34:25
 action#android.intent.action.MAIN
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:31:13-65
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:32:13-65
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:31:21-62
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:32:21-62
 category#android.intent.category.LAUNCHER
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:32:13-73
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:33:13-73
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:32:23-70
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:33:23-70
 activity#com.facebook.react.devsupport.DevSettingsActivity
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:35:7-84
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:7-84
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:35:17-81
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:17-81
 uses-library#org.apache.http.legacy
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:7-85
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:37:7-85
 MERGED from [com.google.android.gms:play-services-maps:18.0.2] C:\Users\lenovo\.gradle\caches\transforms-3\138f60292f4635808fad671641391273\transformed\jetified-play-services-maps-18.0.2\AndroidManifest.xml:39:9-41:40
 MERGED from [com.google.android.gms:play-services-maps:18.0.2] C:\Users\lenovo\.gradle\caches\transforms-3\138f60292f4635808fad671641391273\transformed\jetified-play-services-maps-18.0.2\AndroidManifest.xml:39:9-41:40
 	android:required
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:59-83
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:37:59-83
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:36:21-58
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:37:21-58
 service#com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:38:7-163
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:7-163
 	android:foregroundServiceType
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:38:113-160
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:113-160
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:38:16-112
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:16-112
 service#com.google.android.gms.maps.MapView
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:7-110
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:40:7-110
 	android:foregroundServiceType
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:67-107
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:40:67-107
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:39:16-66
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:40:16-66
 queries
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:42:5-51:15
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:43:5-52:15
 MERGED from [:react-native-email-link] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-email-link\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:7:5-13:15
 MERGED from [:react-native-email-link] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-email-link\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:7:5-13:15
 MERGED from [com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\caches\transforms-3\13cc8f9aa6a9554f28b8b25394263dbe\transformed\jetified-imagepicker-2.1\AndroidManifest.xml:9:5-19:15
@@ -439,17 +449,17 @@ MERGED from [com.github.dhaval2404:imagepicker:2.1] C:\Users\lenovo\.gradle\cach
 MERGED from [com.google.android.gms:play-services-maps:18.0.2] C:\Users\lenovo\.gradle\caches\transforms-3\138f60292f4635808fad671641391273\transformed\jetified-play-services-maps-18.0.2\AndroidManifest.xml:30:5-34:15
 MERGED from [com.google.android.gms:play-services-maps:18.0.2] C:\Users\lenovo\.gradle\caches\transforms-3\138f60292f4635808fad671641391273\transformed\jetified-play-services-maps-18.0.2\AndroidManifest.xml:30:5-34:15
 intent#action:name:android.intent.action.VIEW+data:scheme:tel
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:43:7-46:16
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:7-47:16
 action#android.intent.action.VIEW
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:9-61
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:9-61
 	android:name
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:44:17-58
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:17-58
 data
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:9-38
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:46:9-38
 	android:scheme
-		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:45:15-35
+		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:46:15-35
 intent#action:name:android.intent.action.VIEW+data:scheme:market
-ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:47:7-50:16
+ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml:48:7-51:16
 uses-sdk
 INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
 INJECTED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\main\AndroidManifest.xml
@@ -754,14 +764,6 @@ uses-permission#android.permission.SYSTEM_ALERT_WINDOW
 ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\AndroidManifest.xml:5:5-77
 	android:name
 		ADDED from C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\android\app\src\debug\AndroidManifest.xml:5:22-75
-uses-permission#android.permission.ACCESS_WIFI_STATE
-ADDED from [com.facebook.flipper:flipper:0.182.0] C:\Users\lenovo\.gradle\caches\transforms-3\33de6d1452d2110d7085c31c0539f1a9\transformed\jetified-flipper-0.182.0\AndroidManifest.xml:16:5-76
-MERGED from [:react-native-blob-util] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:23:5-76
-MERGED from [:react-native-blob-util] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:23:5-76
-MERGED from [:react-native-community_netinfo] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\netinfo\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:8:5-76
-MERGED from [:react-native-community_netinfo] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-community\netinfo\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:8:5-76
-	android:name
-		ADDED from [com.facebook.flipper:flipper:0.182.0] C:\Users\lenovo\.gradle\caches\transforms-3\33de6d1452d2110d7085c31c0539f1a9\transformed\jetified-flipper-0.182.0\AndroidManifest.xml:16:22-73
 uses-permission#android.permission.WAKE_LOCK
 ADDED from [:react-native-blob-util] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\react-native-blob-util\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:14:5-68
 MERGED from [:react-native-firebase_analytics] C:\Users\lenovo\unioil-loyalty-rn-app-ios-and-android\node_modules\@react-native-firebase\analytics\android\build\intermediates\merged_manifest\debug\AndroidManifest.xml:9:5-68
diff --git a/android/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/android/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
index 285cf21d..5014af9e 100644
Binary files a/android/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/android/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 484ea262..cf6b04b1 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
     .permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"
diff --git a/index.js b/index.js
index 6da7a073..20425b2c 100644
--- a/index.js
+++ b/index.js
@@ -6,13 +6,11 @@ import './polyfills.js';
 import 'react-native-gesture-handler';
 import 'react-native-reanimated';
 
-import { AppRegistry, LogBox } from 'react-native';
+import { AppRegistry } from 'react-native';
 import App from './app/App';
 import { name as appName } from './app.json';
 import messaging from '@react-native-firebase/messaging';
 
-LogBox.ignoreLogs(['`new NativeEventEmitter()`']);
-
 messaging().setBackgroundMessageHandler(async remoteMessage => {
     console.log("'Message handled in the background!'", remoteMessage);
 });
diff --git a/patches/@react-aria+interactions+3.25.0.patch b/patches/@react-aria+interactions+3.25.0.patch
new file mode 100644
index 00000000..330aeba8
--- /dev/null
+++ b/patches/@react-aria+interactions+3.25.0.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/@react-aria/interactions/dist/usePress.main.js b/node_modules/@react-aria/interactions/dist/usePress.main.js
+index 028a1b3..cbf2934 100644
+--- a/node_modules/@react-aria/interactions/dist/usePress.main.js
++++ b/node_modules/@react-aria/interactions/dist/usePress.main.js
+@@ -5,7 +5,7 @@ var $bBqCQ$swchelperscjs_class_private_field_getcjs = require("@swc/helpers/cjs/
+ var $bBqCQ$swchelperscjs_class_private_field_initcjs = require("@swc/helpers/cjs/_class_private_field_init.cjs");
+ var $bBqCQ$swchelperscjs_class_private_field_setcjs = require("@swc/helpers/cjs/_class_private_field_set.cjs");
+ var $bBqCQ$reactariautils = require("@react-aria/utils");
+-var $bBqCQ$reactdom = require("react-dom");
++var $bBqCQ$reactdom = require("react-native");
+ var $bBqCQ$react = require("react");
+ 
+ 
diff --git a/yarn.lock b/yarn.lock
index d65fafe4..f13417a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2932,9 +2932,9 @@
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/node@*":
-  version "22.14.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.14.1.tgz#53b54585cec81c21eee3697521e31312d6ca1e6f"
-  integrity sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==
+  version "22.15.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.15.3.tgz#b7fb9396a8ec5b5dfb1345d8ac2502060e9af68b"
+  integrity sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==
   dependencies:
     undici-types "~6.21.0"
 
@@ -3682,9 +3682,9 @@ camelize@^1.0.0:
   integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==
 
 caniuse-lite@^1.0.30001688:
-  version "1.0.30001714"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001714.tgz#cfd27ff07e6fa20a0f45c7a10d28a0ffeaba2122"
-  integrity sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==
+  version "1.0.30001715"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz#bd325a37ad366e3fe90827d74062807a34fbaeb2"
+  integrity sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==
 
 card-validator@^3.0.0:
   version "3.0.1"
@@ -4307,9 +4307,9 @@ ee-first@1.1.1:
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.5.73:
-  version "1.5.137"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.137.tgz#53a7fef3ea9f7eb5fcf704454050ff930c43ed92"
-  integrity sha512-/QSJaU2JyIuTbbABAo/crOs+SuAZLS+fVVS10PVrIT9hrRkmZl8Hb0xPSkKRUUWHQtYzXHpQUW3Dy5hwMzGZkA==
+  version "1.5.144"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.144.tgz#9804fd6c342802e1d4b4fe57babbe8b64ca0b46c"
+  integrity sha512-eJIaMRKeAzxfBSxtjYnoIAw/tdD6VIH6tHBZepZnAbE3Gyqqs5mGN87DvcldPUbVkIljTK8pY0CMcUljP64lfQ==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -4913,9 +4913,9 @@ flow-enums-runtime@^0.0.5:
   integrity sha512-PSZF9ZuaZD03sT9YaIs0FrGJ7lSUw7rHZIex+73UYVXg46eL/wxN5PaVcPJFudE2cJu5f0fezitV5aBkLHPUOQ==
 
 flow-parser@0.*:
-  version "0.268.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.268.0.tgz#e21c5e68a2d700d268f1f05a90fb084cae8c6bd6"
-  integrity sha512-URZmPy/jKDDIJUHUfC+5KNwaPcfONTL3R8xltQWVEoCKLWowVebEBg89nbAnYHNo6ev8KzKWFpOROfHZdaCoxA==
+  version "0.269.1"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.269.1.tgz#92067f8100d89a84433c656eb59c5b92e4036eb9"
+  integrity sha512-2Yr0kqvT7RwaGL192nT78O5AWJeECQjl0NEzBkMsx8OJt63BvNl5yvSIbE4qZ1VDSjEkhbUgaWYdwX354bVNjw==
 
 flow-parser@^0.206.0:
   version "0.206.0"
@@ -6237,12 +6237,12 @@ json-stable-stringify-without-jsonify@^1.0.1:
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json-stable-stringify@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz#addb683c2b78014d0b78d704c2fcbdf0695a60e2"
-  integrity sha512-Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.3.0.tgz#8903cfac42ea1a0f97f35d63a4ce0518f0cc6a70"
+  integrity sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==
   dependencies:
     call-bind "^1.0.8"
-    call-bound "^1.0.3"
+    call-bound "^1.0.4"
     isarray "^2.0.5"
     jsonify "^0.0.1"
     object-keys "^1.1.1"