From 9d053931ffa5de44c55d33eff023babff60f610a Mon Sep 17 00:00:00 2001
From: Hailey <me@haileyok.com>
Date: Mon, 2 Dec 2024 12:24:48 -0800
Subject: [PATCH] fix splash

---
 app.config.js | 24 +++++++++++++-----------
 package.json  |  2 +-
 yarn.lock     |  8 ++++----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app.config.js b/app.config.js
index 76a121197b..98875ccdd5 100644
--- a/app.config.js
+++ b/app.config.js
@@ -73,8 +73,6 @@ module.exports = function (config) {
       orientation: 'portrait',
       icon: './assets/app-icons/ios_icon_default_light.png',
       userInterfaceStyle: 'automatic',
-      splash: SPLASH_CONFIG,
-      // hsl(211, 99%, 53%), same as palette.default.brandText
       primaryColor: '#1083fe',
       ios: {
         supportsTablet: false,
@@ -119,10 +117,6 @@ module.exports = function (config) {
           ],
         },
         associatedDomains: ASSOCIATED_DOMAINS,
-        splash: {
-          ...SPLASH_CONFIG,
-          dark: DARK_SPLASH_CONFIG,
-        },
         entitlements: {
           'com.apple.developer.kernel.increased-memory-limit': true,
           'com.apple.developer.kernel.extended-virtual-addressing': true,
@@ -188,10 +182,6 @@ module.exports = function (config) {
             category: ['BROWSABLE', 'DEFAULT'],
           },
         ],
-        splash: {
-          ...SPLASH_CONFIG_ANDROID,
-          dark: DARK_SPLASH_CONFIG_ANDROID,
-        },
       },
       web: {
         favicon: './assets/favicon.png',
@@ -250,7 +240,7 @@ module.exports = function (config) {
         './plugins/starterPackAppClipExtension/withStarterPackAppClip.js',
         './plugins/withAndroidManifestPlugin.js',
         './plugins/withAndroidManifestFCMIconPlugin.js',
-        './plugins/withAndroidStylesWindowBackgroundPlugin.js',
+        // './plugins/withAndroidStylesWindowBackgroundPlugin.js',
         './plugins/withAndroidStylesAccentColorPlugin.js',
         './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',
         './plugins/shareExtension/withShareExtensions.js',
@@ -272,6 +262,18 @@ module.exports = function (config) {
             ],
           },
         ],
+        [
+          'expo-splash-screen',
+          PLATFORM === 'ios'
+            ? {
+                ...SPLASH_CONFIG,
+                dark: DARK_SPLASH_CONFIG,
+              }
+            : {
+                ...SPLASH_CONFIG_ANDROID,
+                dark: DARK_SPLASH_CONFIG_ANDROID,
+              },
+        ],
         [
           '@mozzius/expo-dynamic-app-icon',
           {
diff --git a/package.json b/package.json
index ffa4a63a40..30da600c96 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "@radix-ui/react-focus-guards": "^1.1.1",
     "@radix-ui/react-focus-scope": "^1.1.0",
     "@react-native-async-storage/async-storage": "1.23.1",
-    "@react-native-menu/menu": "^1.1.0",
+    "@react-native-menu/menu": "^1.1.7",
     "@react-native-picker/picker": "2.10.1",
     "@react-navigation/bottom-tabs": "^6.5.20",
     "@react-navigation/drawer": "^6.6.15",
diff --git a/yarn.lock b/yarn.lock
index 40fbe4de7c..dd0f8a9eac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5553,10 +5553,10 @@
   dependencies:
     merge-options "^3.0.4"
 
-"@react-native-menu/menu@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@react-native-menu/menu/-/menu-1.1.0.tgz#e89c0850f7e5aa4c671c44a9c10edafadb23c35a"
-  integrity sha512-vf9zp0M4nbAFnSKz5NJYKUPM5UzXWmLyGcjtuPaKWYxxloz9C0Pp6XdZRJnoOSlfRShE8NksX3bVY8W4wGnlCQ==
+"@react-native-menu/menu@^1.1.7":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@react-native-menu/menu/-/menu-1.1.7.tgz#47c345038951712fd61f2bbb7d591c181c7e9742"
+  integrity sha512-TPu2iNrSK1Davw5BPhwzcSfMAI9NFggiISOgdlaeymA6L7aAjUGpsEaFVX+ZaHml/YtZUuC8U0zUJJc2/3VYAA==
 
 "@react-native-picker/picker@2.10.1":
   version "2.10.1"