From db4bc732ac2c93681deac9b16df60030d23eb829 Mon Sep 17 00:00:00 2001 From: HansiWursti Date: Fri, 22 Dec 2023 19:41:28 +0100 Subject: [PATCH 1/4] Add "error" Page for special accounts in Mobile --- .../src/components/accounts/MobileAccount.jsx | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/packages/desktop-client/src/components/accounts/MobileAccount.jsx b/packages/desktop-client/src/components/accounts/MobileAccount.jsx index 837764310ba..f67fb9c82e6 100644 --- a/packages/desktop-client/src/components/accounts/MobileAccount.jsx +++ b/packages/desktop-client/src/components/accounts/MobileAccount.jsx @@ -22,7 +22,10 @@ import { import useCategories from '../../hooks/useCategories'; import useNavigate from '../../hooks/useNavigate'; import { useSetThemeColor } from '../../hooks/useSetThemeColor'; -import { theme } from '../../style'; +import { theme, styles } from '../../style'; +import Button from '../common/Button'; +import Text from '../common/Text'; +import View from '../common/View'; import AccountDetails from './MobileAccountDetails'; @@ -171,6 +174,27 @@ export default function Account(props) { return null; } + if ( + accountId === 'budgeted' || + accountId === 'offbudget' || + accountId === 'uncategorized' + ) { + return ( + + + There is no Mobile View at the moment + + + + ); + } + const account = accounts.find(acct => acct.id === accountId); const isNewTransaction = id => { From b1e89b8db3ad3dfc913020ab5a47892a90308b09 Mon Sep 17 00:00:00 2001 From: HansiWursti Date: Fri, 22 Dec 2023 19:54:53 +0100 Subject: [PATCH 2/4] Add release notes --- upcoming-release-notes/2114.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 upcoming-release-notes/2114.md diff --git a/upcoming-release-notes/2114.md b/upcoming-release-notes/2114.md new file mode 100644 index 00000000000..0e02c17de1c --- /dev/null +++ b/upcoming-release-notes/2114.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [HansiWursti] +--- + +mobile: error page for special account urls From 8a391ded86d6fdc82a2d278a9308b009debde346 Mon Sep 17 00:00:00 2001 From: HansiWursti Date: Tue, 9 Jan 2024 18:08:04 +0100 Subject: [PATCH 3/4] Reimplemented #2114 to revert the revert in #2186 --- .../src/components/accounts/MobileAccount.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/desktop-client/src/components/accounts/MobileAccount.jsx b/packages/desktop-client/src/components/accounts/MobileAccount.jsx index 85233245dd7..9a7b48da63d 100644 --- a/packages/desktop-client/src/components/accounts/MobileAccount.jsx +++ b/packages/desktop-client/src/components/accounts/MobileAccount.jsx @@ -23,9 +23,9 @@ import { useCategories } from '../../hooks/useCategories'; import { useNavigate } from '../../hooks/useNavigate'; import { useSetThemeColor } from '../../hooks/useSetThemeColor'; import { theme, styles } from '../../style'; -import Button from '../common/Button'; -import Text from '../common/Text'; -import View from '../common/View'; +import { Button } from '../common/Button'; +import { Text } from '../common/Text'; +import { View } from '../common/View'; import { AccountDetails } from './MobileAccountDetails'; From e21915b08701f4fde5a8e0057f8ac3f37110241d Mon Sep 17 00:00:00 2001 From: HansiWursti Date: Tue, 9 Jan 2024 18:13:54 +0100 Subject: [PATCH 4/4] Add release Notes --- upcoming-release-notes/2114.md | 6 ------ upcoming-release-notes/2204.md | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 upcoming-release-notes/2114.md create mode 100644 upcoming-release-notes/2204.md diff --git a/upcoming-release-notes/2114.md b/upcoming-release-notes/2114.md deleted file mode 100644 index 0e02c17de1c..00000000000 --- a/upcoming-release-notes/2114.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -category: Bugfix -authors: [HansiWursti] ---- - -mobile: error page for special account urls diff --git a/upcoming-release-notes/2204.md b/upcoming-release-notes/2204.md new file mode 100644 index 00000000000..34922bfefe6 --- /dev/null +++ b/upcoming-release-notes/2204.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [HansiWursti] +--- + +Re implemented the mobile Account Error Page introduced in #2114 and reverted in #2186 \ No newline at end of file