Skip to content
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

Fix status bar of mWeb Safari doesn't match the splash screen background color #41830

Merged
merged 6 commits into from
Jun 14, 2024
Merged

Fix status bar of mWeb Safari doesn't match the splash screen background color #41830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
65ae4fc
set the initial value of the status bar
bernhardoj May 8, 2024
e9dd805
Merge branch 'main' into fix/40683-status-bar-color
bernhardoj May 13, 2024
c3ee9c1
Merge branch 'main' into fix/40683-status-bar-color
bernhardoj May 28, 2024
3539dbd
update splashBG color
bernhardoj May 28, 2024
21f55c7
don't update status bar color on mount
bernhardoj May 28, 2024
381c92d
Merge branch 'main' into fix/40683-status-bar-color
bernhardoj May 29, 2024
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
5 changes: 0 additions & 5 deletions src/components/CustomStatusBarAndBackground/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,6 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
[prevIsRootStatusBarEnabled, isRootStatusBarEnabled, statusBarAnimation, statusBarStyle, theme.PAGE_THEMES, theme.appBG, theme.statusBarStyle],
);

useEffect(() => {
updateStatusBarAppearance({backgroundColor: theme.appBG});
// eslint-disable-next-line react-hooks/exhaustive-deps -- we only want this to run on first render
}, []);

useEffect(() => {
didForceUpdateStatusBarRef.current = false;
}, [isRootStatusBarEnabled]);
Expand Down
7 changes: 0 additions & 7 deletions src/libs/getSplashBackgroundColor/index.native.ts
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/libs/getSplashBackgroundColor/index.ts
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/styles/theme/themes/dark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import getSplashBackgroundColor from '@libs/getSplashBackgroundColor';
import colors from '@styles/theme/colors';
import type {ThemeColors} from '@styles/theme/types';
import CONST from '@src/CONST';
Expand All @@ -7,7 +6,7 @@ import SCREENS from '@src/SCREENS';
const darkTheme = {
// Figma keys
appBG: colors.productDark100,
splashBG: getSplashBackgroundColor(),
splashBG: colors.green400,
highlightBG: colors.productDark200,
border: colors.productDark400,
borderLighter: colors.productDark400,
Expand Down
3 changes: 1 addition & 2 deletions src/styles/theme/themes/light.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import getSplashBackgroundColor from '@libs/getSplashBackgroundColor';
import colors from '@styles/theme/colors';
import type {ThemeColors} from '@styles/theme/types';
import CONST from '@src/CONST';
Expand All @@ -7,7 +6,7 @@ import SCREENS from '@src/SCREENS';
const lightTheme = {
// Figma keys
appBG: colors.productLight100,
splashBG: getSplashBackgroundColor(),
splashBG: colors.green400,
highlightBG: colors.productLight200,
border: colors.productLight400,
borderLighter: colors.productLight400,
Expand Down
2 changes: 1 addition & 1 deletion web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />
<title>New Expensify</title>
<meta name="description" content="Corporate cards, reimbursements, receipt scanning, invoicing, and bill pay.">
<meta name="theme-color" content="">
<meta name="theme-color" content="#03D47C">
<meta property="twitter:card" content="summary">
<meta property="twitter:site" content="@expensify">
<meta property="og:type" content="website">
Expand Down
Loading