From 30684a47d74edc5eef2cf49a499e92db06956bbf Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Wed, 26 Apr 2023 22:23:48 +0100
Subject: [PATCH] :bug: (mobile) correct topbar color on settings page (#960)
Closes #935
Before: we render all the pages (even the inactive ones in some cases)
After: we render only the visible pages. Thus the topbar color is set
only 1x.. thus the settings page topbar has the correct color.
---
.../src/components/FinancesApp.js | 75 +++++++++----------
upcoming-release-notes/960.md | 6 ++
2 files changed, 41 insertions(+), 40 deletions(-)
create mode 100644 upcoming-release-notes/960.md
diff --git a/packages/desktop-client/src/components/FinancesApp.js b/packages/desktop-client/src/components/FinancesApp.js
index f70a17f5c..1db5ae053 100644
--- a/packages/desktop-client/src/components/FinancesApp.js
+++ b/packages/desktop-client/src/components/FinancesApp.js
@@ -80,46 +80,41 @@ function PageRoute({ path, component: Component }) {
function Routes({ isMobile, location }) {
return (
<Switch location={location}>
- <Route path="/">
- <Route path="/" exact render={() => <Redirect to="/budget" />} />
-
- <PageRoute path="/reports" component={Reports} />
- <PageRoute
- path="/budget"
- component={isMobile ? MobileBudget : Budget}
- />
-
- <Route path="/schedules" exact component={Schedules} />
- <Route path="/schedule/edit" exact component={EditSchedule} />
- <Route path="/schedule/edit/:id" component={EditSchedule} />
- <Route path="/schedule/link" component={LinkSchedule} />
- <Route path="/schedule/discover" component={DiscoverSchedules} />
- <Route
- path="/schedule/posts-offline-notification"
- component={PostsOfflineNotification}
- />
-
- <Route path="/payees" exact component={ManagePayeesPage} />
- <Route path="/rules" exact component={ManageRulesPage} />
- <Route path="/settings" component={Settings} />
- <Route path="/nordigen/link" exact component={NordigenLink} />
-
- <Route
- path="/accounts/:id"
- exact
- children={props => {
- const AcctCmp = isMobile ? MobileAccount : Account;
- return (
- props.match && <AcctCmp key={props.match.params.id} {...props} />
- );
- }}
- />
- <Route
- path="/accounts"
- exact
- component={isMobile ? MobileAccounts : Account}
- />
- </Route>
+ <Route path="/" exact render={() => <Redirect to="/budget" />} />
+
+ <PageRoute path="/reports" component={Reports} />
+ <PageRoute path="/budget" component={isMobile ? MobileBudget : Budget} />
+
+ <Route path="/schedules" exact component={Schedules} />
+ <Route path="/schedule/edit" exact component={EditSchedule} />
+ <Route path="/schedule/edit/:id" component={EditSchedule} />
+ <Route path="/schedule/link" component={LinkSchedule} />
+ <Route path="/schedule/discover" component={DiscoverSchedules} />
+ <Route
+ path="/schedule/posts-offline-notification"
+ component={PostsOfflineNotification}
+ />
+
+ <Route path="/payees" exact component={ManagePayeesPage} />
+ <Route path="/rules" exact component={ManageRulesPage} />
+ <Route path="/settings" component={Settings} />
+ <Route path="/nordigen/link" exact component={NordigenLink} />
+
+ <Route
+ path="/accounts/:id"
+ exact
+ children={props => {
+ const AcctCmp = isMobile ? MobileAccount : Account;
+ return (
+ props.match && <AcctCmp key={props.match.params.id} {...props} />
+ );
+ }}
+ />
+ <Route
+ path="/accounts"
+ exact
+ component={isMobile ? MobileAccounts : Account}
+ />
</Switch>
);
}
diff --git a/upcoming-release-notes/960.md b/upcoming-release-notes/960.md
new file mode 100644
index 000000000..f559ca012
--- /dev/null
+++ b/upcoming-release-notes/960.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MatissJanis]
+---
+
+Mobile: use the correct top-bar background color in settings page
--
GitLab