From ccea520ed4c7696f1322d7aa1057cc874cf07313 Mon Sep 17 00:00:00 2001
From: Adil Kabbari <a.kabbari692@mybvc.ca>
Date: Thu, 11 Sep 2025 17:36:07 -0600
Subject: [PATCH 1/4] Sarah: initial login screen - set StatusBar light

---
 App.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/App.tsx b/App.tsx
index 10b5f54..9e4e785 100644
--- a/App.tsx
+++ b/App.tsx
@@ -25,7 +25,7 @@ export default function App() {
     } else {
         return (
             <>
-                <StatusBar animated translucent style="dark" />
+                <StatusBar animated translucent style="light" />
                 <ActionSheetProvider>
                     <AppStack />
                 </ActionSheetProvider>

From 57c6f2f5397e2f832112c98ad95a47dfd2edb4e9 Mon Sep 17 00:00:00 2001
From: Adil Kabbari <a.kabbari692@mybvc.ca>
Date: Thu, 11 Sep 2025 17:45:13 -0600
Subject: [PATCH 2/4] Jose: login screen update - set StatusBar auto

---
 App.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/App.tsx b/App.tsx
index 10b5f54..05bcb05 100644
--- a/App.tsx
+++ b/App.tsx
@@ -25,7 +25,7 @@ export default function App() {
     } else {
         return (
             <>
-                <StatusBar animated translucent style="dark" />
+                <StatusBar animated translucent style="auto" />
                 <ActionSheetProvider>
                     <AppStack />
                 </ActionSheetProvider>

From e90beb90ccf31245e579a83c2767020cb987c476 Mon Sep 17 00:00:00 2001
From: RemoStain <c.wise522@mybvc.ca>
Date: Wed, 17 Sep 2025 11:55:53 -0600
Subject: [PATCH 3/4] Merge login-screen-update into login-screen-initial;
 resolved conflicts

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 90b5ef8..e5b5a3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ npm-debug.*
 *.mobileprovision
 *.orig.*
 web-build/
+.vs/
 
 # macOS
 .DS_Store

From dd6b7c588354af7435e974a00d7abf44156d435d Mon Sep 17 00:00:00 2001
From: RemoStain <c.wise522@mybvc.ca>
Date: Wed, 17 Sep 2025 12:05:59 -0600
Subject: [PATCH 4/4] Resolve merge conflict: set StatusBar to dark

---
 App.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/App.tsx b/App.tsx
index 10b5f54..5927175 100644
--- a/App.tsx
+++ b/App.tsx
@@ -12,7 +12,7 @@ import {
 import AppStack from './src/routes/AppStack';
 import { StatusBar } from 'expo-status-bar';
 
-export default function App() {
+export default function App(): any {
     const [fontsLoaded] = useFonts({
         Nunito_400Regular,
         Nunito_600SemiBold,
@@ -25,7 +25,7 @@ export default function App() {
     } else {
         return (
             <>
-                <StatusBar animated translucent style="dark" />
+                <StatusBar animated translucent style="Dark" />
                 <ActionSheetProvider>
                     <AppStack />
                 </ActionSheetProvider>