From 117358af4ddea39e71efd27c1b00d2db04845641 Mon Sep 17 00:00:00 2001
From: im-adithya <imadithyavardhan@gmail.com>
Date: Mon, 30 Dec 2024 13:46:20 +0530
Subject: [PATCH 1/5] fix: get theme from device

---
 app.json              |  6 ++++--
 app/_layout.tsx       |  8 ++++++--
 lib/state/appStore.ts |  6 +++---
 package.json          |  1 +
 yarn.lock             | 13 +++++++++++++
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app.json b/app.json
index 5d8fd3b..8fa1a88 100644
--- a/app.json
+++ b/app.json
@@ -50,7 +50,8 @@
       },
       "infoPlist": {
         "LSMinimumSystemVersion": "12.0"
-      }
+      },
+      "userInterfaceStyle": "automatic"
     },
     "android": {
       "package": "com.getalby.mobile",
@@ -60,7 +61,8 @@
         "backgroundImage": "./assets/adaptive-icon-bg.png",
         "monochromeImage": "./assets/monochromatic.png"
       },
-      "permissions": ["android.permission.CAMERA"]
+      "permissions": ["android.permission.CAMERA"],
+      "userInterfaceStyle": "automatic"
     },
     "extra": {
       "eas": {
diff --git a/app/_layout.tsx b/app/_layout.tsx
index e34d644..2b10fed 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -69,10 +69,14 @@ export default function RootLayout() {
   const loadTheme = React.useCallback((): Promise<void> => {
     return new Promise((resolve) => {
       const theme = useAppStore.getState().theme;
-      setColorScheme(theme);
+      if (theme) {
+        setColorScheme(theme);
+      } else {
+        useAppStore.getState().setTheme(isDarkColorScheme ? "dark" : "light");
+      }
       resolve();
     });
-  }, [setColorScheme]);
+  }, [isDarkColorScheme, setColorScheme]);
 
   React.useEffect(() => {
     const init = async () => {
diff --git a/lib/state/appStore.ts b/lib/state/appStore.ts
index ce227e0..1fee427 100644
--- a/lib/state/appStore.ts
+++ b/lib/state/appStore.ts
@@ -12,7 +12,7 @@ interface AppState {
   readonly addressBookEntries: AddressBookEntry[];
   readonly isSecurityEnabled: boolean;
   readonly isOnboarded: boolean;
-  readonly theme: Theme;
+  readonly theme?: Theme;
   readonly balanceDisplayMode: BalanceDisplayMode;
   setUnlocked: (unlocked: boolean) => void;
   setTheme: (theme: Theme) => void;
@@ -45,7 +45,7 @@ const isSecurityEnabledKey = "isSecurityEnabled";
 export const lastActiveTimeKey = "lastActiveTime";
 
 export type BalanceDisplayMode = "sats" | "fiat" | "hidden";
-export type Theme = "system" | "light" | "dark";
+export type Theme = "light" | "dark";
 
 type Wallet = {
   name?: string;
@@ -176,7 +176,7 @@ export const useAppStore = create<AppState>()((set, get) => {
   const isSecurityEnabled =
     secureStorage.getItem(isSecurityEnabledKey) === "true";
 
-  const theme = (secureStorage.getItem(themeKey) as Theme) || "system";
+  const theme = (secureStorage.getItem(themeKey) as Theme) || null;
   const balanceDisplayMode =
     (secureStorage.getItem(balanceDisplayModeKey) as BalanceDisplayMode) ||
     "sats";
diff --git a/package.json b/package.json
index 402050f..fa0ff6c 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "expo-router": "~4.0.11",
     "expo-secure-store": "~14.0.0",
     "expo-status-bar": "~2.0.0",
+    "expo-system-ui": "~4.0.6",
     "lottie-react-native": "7.1.0",
     "message-port-polyfill": "^0.2.0",
     "nativewind": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index 3ed274e..e962198 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1947,6 +1947,11 @@
   resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.76.3.tgz#8d4de4a8671385c53b2d202ef0137632abcf747d"
   integrity sha512-Yrpmrh4IDEupUUM/dqVxhAN8QW1VEUR3Qrk2lzJC1jB2s46hDe0hrMP2vs12YJqlzshteOthjwXQlY0TgIzgbg==
 
+"@react-native/normalize-colors@0.76.5":
+  version "0.76.5"
+  resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.76.5.tgz#a33560736311aefcf1d3cb594597befe81a9a53c"
+  integrity sha512-6QRLEok1r55gLqj+94mEWUENuU5A6wsr2OoXpyq/CgQ7THWowbHtru/kRGRr6o3AQXrVnZheR60JNgFcpNYIug==
+
 "@react-native/virtualized-lists@0.76.3":
   version "0.76.3"
   resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.76.3.tgz#9865f9e3770c101476564dc2436018f82adfb4b3"
@@ -4573,6 +4578,14 @@ expo-status-bar@~2.0.0:
   resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-2.0.0.tgz#dd99adc2ace12a24c92718cd0f97b93347103393"
   integrity sha512-vxxdpvpNDMTEc5uTiIrbTvySKKUsOACmfl8OZuUdjNle05oGqwtq3v5YObwym/njSByjoyuZX8UpXBZnxvarwQ==
 
+expo-system-ui@~4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/expo-system-ui/-/expo-system-ui-4.0.6.tgz#23d172e346dbe478f31e36019c2570242e7c0762"
+  integrity sha512-JWmw0aaNIB8YxA6bXgH6nClyledZaAG5VNzoRvmXT4+j3MY4waAHSSSdVV71bUgjchT/2KOAcibZ/EeosJONug==
+  dependencies:
+    "@react-native/normalize-colors" "0.76.5"
+    debug "^4.3.2"
+
 expo@~52.0.14:
   version "52.0.14"
   resolved "https://registry.yarnpkg.com/expo/-/expo-52.0.14.tgz#e99a921dc5caff4b5b68fa96069ba7c3e64c4d17"

From 2dd48822f19d54b26088fdf0fc8570cc3fb934b0 Mon Sep 17 00:00:00 2001
From: im-adithya <imadithyavardhan@gmail.com>
Date: Mon, 30 Dec 2024 16:05:54 +0530
Subject: [PATCH 2/5] fix: use splash screen config plugin

---
 app.json        | 13 ++++++++-----
 app/_layout.tsx |  5 +++--
 package.json    |  1 +
 yarn.lock       | 29 +++++++++++++++++++++++++++++
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/app.json b/app.json
index 5d8fd3b..80a816b 100644
--- a/app.json
+++ b/app.json
@@ -7,14 +7,17 @@
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "automatic",
-    "splash": {
-      "image": "./assets/splash.png",
-      "resizeMode": "cover",
-      "backgroundColor": "#0B0930"
-    },
     "newArchEnabled": true,
     "assetBundlePatterns": ["**/*"],
     "plugins": [
+      [
+        "expo-splash-screen",
+        {
+          "backgroundColor": "#0B0930",
+          "image": "./assets/icon.png",
+          "imageWidth": "150"
+        }
+      ],
       [
         "expo-local-authentication",
         {
diff --git a/app/_layout.tsx b/app/_layout.tsx
index e34d644..528fceb 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -6,7 +6,8 @@ import {
 } from "@react-navigation/native";
 import { PortalHost } from "@rn-primitives/portal";
 import * as Font from "expo-font";
-import { Slot, SplashScreen } from "expo-router";
+import { Slot } from "expo-router";
+import * as SplashScreen from "expo-splash-screen";
 import { StatusBar } from "expo-status-bar";
 import { swrConfiguration } from "lib/swr";
 import * as React from "react";
@@ -80,7 +81,7 @@ export default function RootLayout() {
         await Promise.all([loadTheme(), loadFonts(), checkBiometricStatus()]);
       } finally {
         setResourcesLoaded(true);
-        SplashScreen.hideAsync();
+        SplashScreen.hide();
       }
     };
 
diff --git a/package.json b/package.json
index 402050f..207330e 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "expo-local-authentication": "~15.0.1",
     "expo-router": "~4.0.11",
     "expo-secure-store": "~14.0.0",
+    "expo-splash-screen": "^0.29.18",
     "expo-status-bar": "~2.0.0",
     "lottie-react-native": "7.1.0",
     "message-port-polyfill": "^0.2.0",
diff --git a/yarn.lock b/yarn.lock
index 3ed274e..072f278 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1200,6 +1200,23 @@
     semver "^7.6.0"
     xml2js "0.6.0"
 
+"@expo/prebuild-config@^8.0.23":
+  version "8.0.23"
+  resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-8.0.23.tgz#2ec6d5464f35d308bdb94ba75b7e6aba0ebb507d"
+  integrity sha512-Zf01kFiN2PISmLb0DhIAJh76v3J2oYUKSjiAtGZLOH0HUz59by/qdyU4mGHWdeyRdCCrLUA21Rct2MBykvRMsg==
+  dependencies:
+    "@expo/config" "~10.0.4"
+    "@expo/config-plugins" "~9.0.10"
+    "@expo/config-types" "^52.0.0"
+    "@expo/image-utils" "^0.6.0"
+    "@expo/json-file" "^9.0.0"
+    "@react-native/normalize-colors" "0.76.5"
+    debug "^4.3.1"
+    fs-extra "^9.0.0"
+    resolve-from "^5.0.0"
+    semver "^7.6.0"
+    xml2js "0.6.0"
+
 "@expo/rudder-sdk-node@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@expo/rudder-sdk-node/-/rudder-sdk-node-1.1.1.tgz#6aa575f346833eb6290282118766d4919c808c6a"
@@ -1947,6 +1964,11 @@
   resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.76.3.tgz#8d4de4a8671385c53b2d202ef0137632abcf747d"
   integrity sha512-Yrpmrh4IDEupUUM/dqVxhAN8QW1VEUR3Qrk2lzJC1jB2s46hDe0hrMP2vs12YJqlzshteOthjwXQlY0TgIzgbg==
 
+"@react-native/normalize-colors@0.76.5":
+  version "0.76.5"
+  resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.76.5.tgz#a33560736311aefcf1d3cb594597befe81a9a53c"
+  integrity sha512-6QRLEok1r55gLqj+94mEWUENuU5A6wsr2OoXpyq/CgQ7THWowbHtru/kRGRr6o3AQXrVnZheR60JNgFcpNYIug==
+
 "@react-native/virtualized-lists@0.76.3":
   version "0.76.3"
   resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.76.3.tgz#9865f9e3770c101476564dc2436018f82adfb4b3"
@@ -4568,6 +4590,13 @@ expo-secure-store@~14.0.0:
   resolved "https://registry.yarnpkg.com/expo-secure-store/-/expo-secure-store-14.0.0.tgz#cf6eb7f73e619f8907d5a073e2f438927b5fc2ab"
   integrity sha512-VyhtRFXP+7hQmHhKlHIOWid1Q/IRpM7Uif32tZHLZHvQ6FNz2cUkr26XWGvCa7btYbrR6OL++FBFZYjbIcRZTw==
 
+expo-splash-screen@^0.29.18:
+  version "0.29.18"
+  resolved "https://registry.yarnpkg.com/expo-splash-screen/-/expo-splash-screen-0.29.18.tgz#96ccce3d5a03389a9061743903b0a77c22a16796"
+  integrity sha512-bTBY+LF6YtYen2j60yGNh2SX/tG4UXZAyBCMMriOSiZZ7LSCs3ARyEufaSiWk+ckWShTeMqItOnaAN/CAF8MJA==
+  dependencies:
+    "@expo/prebuild-config" "^8.0.23"
+
 expo-status-bar@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-2.0.0.tgz#dd99adc2ace12a24c92718cd0f97b93347103393"

From 951f7d42371ab68467d00fc5c457170660dea32b Mon Sep 17 00:00:00 2001
From: im-adithya <imadithyavardhan@gmail.com>
Date: Mon, 30 Dec 2024 19:20:44 +0530
Subject: [PATCH 3/5] chore: remove splash png

---
 assets/splash.png | Bin 15004 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 assets/splash.png

diff --git a/assets/splash.png b/assets/splash.png
deleted file mode 100644
index ae04ebf2613732fe8dc3327d554d31269fe8abe3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15004
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
UOP4fa`Jb*bl8O@5;>Lmh2dWX!ga7~l


From eca2d15ff0e896e6e66b4920d221299e6f554f4f Mon Sep 17 00:00:00 2001
From: im-adithya <imadithyavardhan@gmail.com>
Date: Mon, 30 Dec 2024 14:21:27 +0530
Subject: [PATCH 4/5] fix: screen header right buttons

---
 pages/Home.tsx                         | 12 +++++++-----
 pages/Transactions.tsx                 |  2 +-
 pages/send/PaymentSuccess.tsx          |  1 +
 pages/settings/wallets/SetupWallet.tsx |  8 ++++----
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pages/Home.tsx b/pages/Home.tsx
index ea926ca..4a32b44 100644
--- a/pages/Home.tsx
+++ b/pages/Home.tsx
@@ -65,11 +65,13 @@ export function Home() {
       <Screen
         title=""
         right={() => (
-          <Link href="/settings" asChild>
-            <TouchableOpacity>
-              <SettingsIcon className="text-muted-foreground" />
-            </TouchableOpacity>
-          </Link>
+          <TouchableOpacity
+            onPressIn={() => {
+              router.push("/settings");
+            }}
+          >
+            <SettingsIcon className="text-muted-foreground" />
+          </TouchableOpacity>
         )}
       />
       <View className="h-full flex p-6">
diff --git a/pages/Transactions.tsx b/pages/Transactions.tsx
index 0f3ab2f..b241eb6 100644
--- a/pages/Transactions.tsx
+++ b/pages/Transactions.tsx
@@ -75,7 +75,7 @@ export function Transactions() {
         animation="slide_from_bottom"
         right={() => (
           <Pressable
-            onPress={() => {
+            onPressIn={() => {
               router.back();
             }}
           >
diff --git a/pages/send/PaymentSuccess.tsx b/pages/send/PaymentSuccess.tsx
index 3be99ce..c11a127 100644
--- a/pages/send/PaymentSuccess.tsx
+++ b/pages/send/PaymentSuccess.tsx
@@ -1,6 +1,7 @@
 import { openURL } from "expo-linking";
 import { router, useLocalSearchParams } from "expo-router";
 import { LNURLPaymentSuccessAction } from "lib/lnurl";
+import React from "react";
 import { ScrollView, View } from "react-native";
 import { Tick } from "~/animations/Tick";
 import { Receiver } from "~/components/Receiver";
diff --git a/pages/settings/wallets/SetupWallet.tsx b/pages/settings/wallets/SetupWallet.tsx
index 4bad391..315dbdb 100644
--- a/pages/settings/wallets/SetupWallet.tsx
+++ b/pages/settings/wallets/SetupWallet.tsx
@@ -4,7 +4,7 @@ import * as Clipboard from "expo-clipboard";
 import { router, useLocalSearchParams } from "expo-router";
 import { useAppStore } from "lib/state/appStore";
 import React from "react";
-import { Pressable, TouchableOpacity, View } from "react-native";
+import { TouchableOpacity, View } from "react-native";
 import Toast from "react-native-toast-message";
 import Alert from "~/components/Alert";
 import DismissableKeyboardView from "~/components/DismissableKeyboardView";
@@ -153,8 +153,8 @@ export function SetupWallet() {
         title="Setup Wallet Connection"
         right={() =>
           walletIdWithConnection !== -1 ? (
-            <Pressable
-              onPress={() => {
+            <TouchableOpacity
+              onPressIn={() => {
                 useAppStore
                   .getState()
                   .setSelectedWalletId(walletIdWithConnection);
@@ -165,7 +165,7 @@ export function SetupWallet() {
               }}
             >
               <XIcon className="text-foreground" />
-            </Pressable>
+            </TouchableOpacity>
           ) : (
             <Dialog>
               <DialogTrigger asChild>

From f068acbc13dae88599cd6ee7bb0ebc2b9a2e6e7d Mon Sep 17 00:00:00 2001
From: im-adithya <imadithyavardhan@gmail.com>
Date: Mon, 30 Dec 2024 19:37:49 +0530
Subject: [PATCH 5/5] chore: add touchable opacity to show transactions button

---
 pages/Home.tsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pages/Home.tsx b/pages/Home.tsx
index 4a32b44..5715d2a 100644
--- a/pages/Home.tsx
+++ b/pages/Home.tsx
@@ -147,12 +147,14 @@ export function Home() {
           </View>
         </ScrollView>
         <View className="flex items-center justify-center">
-          <Link href="/transactions">
-            <ChevronUpIcon
-              className="text-muted-foreground"
-              width={32}
-              height={32}
-            />
+          <Link href="/transactions" asChild>
+            <TouchableOpacity>
+              <ChevronUpIcon
+                className="text-muted-foreground"
+                width={32}
+                height={32}
+              />
+            </TouchableOpacity>
           </Link>
         </View>
         <View className="flex flex-row gap-6 mt-10">