Skip to content

Merge login-screen-update into login-screen-initial and align to design #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RemoStain wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Merge login-screen-update into login-screen-initial and align to design #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccea520
Sarah: initial login screen - set StatusBar light
adilkabbariBVC Sep 11, 2025
57c6f2f
Jose: login screen update - set StatusBar auto
adilkabbariBVC Sep 11, 2025
e61f9f1
Resolve conflicts: merge login-screen-update into login-screen-initia…
adilkabbariBVC Sep 11, 2025
e90beb9
Merge login-screen-update into login-screen-initial; resolved conflicts
Sep 17, 2025
dd6b7c5
Resolve merge conflict: set StatusBar to dark
Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ npm-debug.*
*.mobileprovision
*.orig.*
web-build/
.vs/

# macOS
.DS_Store
Expand Down
4 changes: 2 additions & 2 deletions App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -25,7 +25,7 @@ export default function App() {
} else {
return (
<>
<StatusBar animated translucent style="dark" />
<StatusBar animated translucent style="Dark" />
<ActionSheetProvider>
<AppStack />
</ActionSheetProvider>
Expand Down