diff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png index db20f97c9684d79de15ae77daf85cae9ff409547..a2e2fc3f1b967b26480683520384b0c83aa98999 100644 Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-1-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png index dd98f0c1392566992385d5ef250c5c1a8cb355ec..6240ae33bc16d6a11b29a30885b9f498615b3459 100644 Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-2-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png index b0ae0849792db687b13fd1a1b8975aaef1213cff..7290097d372f18c08304a03ca5acc30965445f08 100644 Binary files a/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.js-snapshots/Accounts-closes-an-account-3-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png index 7ab4ea91bb83824177a6e8e47bd1e88a22d4c582..a46b5dc8c6206b3bea7749f8d56e6a3e9e81acf4 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-1-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png index 620d3a5eeccc84c862218806d4c7291ec804bd67..4f3a11ef166882d26f3f4670c72fd0943beb9e33 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-2-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-3-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-3-chromium-linux.png index 4736f0c45816dd8951336dd777a9201b85a9e0ef..83b958b5e86a5066c51873b127ca0b5c03751d28 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-3-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-from-accounts-id-page-3-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png index 9e4d97f3c4e2048aa3cd6b59deaf6791976e18e1..75ecd7a13fb384b69ba28fd7d7d9005bb33dede2 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-1-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png index 1241e32dd94a3a6f402c99ad0e3ef68411327c82..7ac8627924a87e0f4feb8dd51f08a036e3af33eb 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-2-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-3-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-3-chromium-linux.png index 00d80bcc86a08384390507aabe55bf6c6a86fd69..ce38feb390e46032673d4d0513ee7bfdca025c65 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-3-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-3-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-4-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-4-chromium-linux.png index 145100ac8843f10597e533a04253d7f375ff557d..0a7f75a1db9d1bf92c81ff41b6e92f9f07c1f9a3 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-4-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-4-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-5-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-5-chromium-linux.png index 9ac1868fcaed857d5701c072553b848a0dc33b2b..63457edde02e4855895ee687134ec1e1d979d760 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-5-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-5-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-6-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-6-chromium-linux.png index fa541bec75bfe84d96ab2ab9afd6290ea5d5ba00..471578b58c46c4d45aac2ac5f3b109d791949b24 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-6-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-6-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.png index 94ee19d49d1ae63b55fbf2b9e7a7c0771b607640..4a74795c3596fa560881d1042fca6910d5e109da 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.png index 860b002cb4f157fb16f4bf0c00cbad66e275a858..c94118d01fdbfaab252d1bfe48a914ef72eed8fd 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.png index bd238ed1e3ccd313536b266c75cadd74911d210c..2baf84cd33f60b684273eac2634e8df52764b871 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png index 7925d23a6f9ce7e608476447ce0e839eeba8c261..8398ad9a138e875442bb62625432c154d78d7eb2 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-2-chromium-linux.png index fd505d8b93c95d8e0e3fc9e90f75dc77b219a6cf..bcbf6317cb7b2d82de9b5db6833953e2f4f3df4d 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-2-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-3-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-3-chromium-linux.png index 40c85583e445c1beb30dacab58ab25dfd93ad31e..a8e5f9cadea1c04b4c4686e2ac1fe1797b995c4b 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-3-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-loads-the-budget-page-with-budgeted-amounts-3-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png index d155399a88cc237103d1c0ef7977cbcc2820f6b6..4179ae330de2ce3703049b25fe9cfe9c41c8b040 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png index 5e271581102ce676239f79c24225e182529d7af4..2f7558963121e4a64f549249a7569883552c4d97 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png index 5f00edd8e16cdbaeec239576602ca158756fc9cd..0eadc7a8b1b1d90d4ee4781ce4962a29597a7a9f 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-4-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-4-chromium-linux.png index 2c233815a964b72a2031d58348742cbfe5792205..3f25d620dec0da30168de09e593f93730e4232f4 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-4-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-4-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-5-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-5-chromium-linux.png index b005fa53c4a4c90337df0b17c1b93a9e6a017054..b086470274c317eba47b6d0a74153c3598a88c4f 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-5-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-5-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-6-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-6-chromium-linux.png index 674bff53dd49e5e90306a8b8ce631670d074ddea..97bdc264868d6dec0fe65a8f0a08eae625002582 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-6-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-6-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png index 62f4c3567cdbeb063d6808fbe3890339ff08916a..e9013e3c296c6392f9c03f793914a6f8bab68432 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png index 1eab2c224b3d00c1afbcceefd8ced950a8b2d6a3..229dd51550e27fc86f45430b2bc9ed85e17a7203 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png index 3b355497374a389526cc33bdc9ec0d7a69cb0d3d..5efe59d5e13b206a2271f2c18fbf70b0b9567f2c 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-individual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-1-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-1-chromium-linux.png index cc93f024d10671b19836b4ab997a90c5bea4dc7f..1198008571cc377e3c20b8665344cbfbe61e5598 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-1-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-1-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png index 08fb74db9c3380e1b2da6ac2a9a70f97293ac738..197fb1fabb32aec3afafb1d05764bf9d40ed501e 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-2-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png index 5cfd3b9c2a965a402e29fc20820dbbbe6145288f..24e40f4469cf52679894803551ad8d57e5be9ee1 100644 Binary files a/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png and b/packages/desktop-client/e2e/mobile.test.js-snapshots/Mobile-opens-the-accounts-page-and-asserts-on-balances-3-chromium-linux.png differ diff --git a/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png index e2dd224a8f5ae2101f31fd3432e424995010c3c0..d4ff966a8dbc827faa8c7eaa8d95726d90c55b69 100644 Binary files a/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.js-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png differ diff --git a/packages/desktop-client/src/components/common/Label.tsx b/packages/desktop-client/src/components/common/Label.tsx index 393461cdff7ad6a6a6ae38d5bdf0ca2e57c44e17..eb71d346876a8c6630aa76c5a0d94d05bf393c30 100644 --- a/packages/desktop-client/src/components/common/Label.tsx +++ b/packages/desktop-client/src/components/common/Label.tsx @@ -16,7 +16,7 @@ export function Label({ title, style }: LabelProps) { ...styles.text, color: theme.tableRowHeaderText, textAlign: 'right', - fontSize: 12, + fontSize: 14, marginBottom: 2, ...style, }} diff --git a/packages/desktop-client/src/components/common/Modal.tsx b/packages/desktop-client/src/components/common/Modal.tsx index 68912ae30344bca2c711c5a74609ba78c5266dd4..6d0e26e05f3906ddc3a6a5f212ea075efe7abb3f 100644 --- a/packages/desktop-client/src/components/common/Modal.tsx +++ b/packages/desktop-client/src/components/common/Modal.tsx @@ -156,9 +156,9 @@ export const Modal = ({ style={{ justifyContent: 'center', alignItems: 'center', - padding: 20, + padding: '0 20px', position: 'relative', - height: 80, + height: 70, }} > <View diff --git a/packages/desktop-client/src/components/mobile/MobileForms.tsx b/packages/desktop-client/src/components/mobile/MobileForms.tsx index 9b5394a024a9b5f5c5b879f62cd825fda8eb9b10..b2ed06cf73088fcaac6ce3271bdce34fc275f412 100644 --- a/packages/desktop-client/src/components/mobile/MobileForms.tsx +++ b/packages/desktop-client/src/components/mobile/MobileForms.tsx @@ -24,10 +24,9 @@ export function FieldLabel({ title, flush, style }: FieldLabelProps) { style={{ marginBottom: 5, marginTop: flush ? 0 : 25, - fontSize: 13, + fontSize: 14, color: theme.tableRowHeaderText, padding: `0 ${styles.mobileEditingPadding}px`, - textTransform: 'uppercase', userSelect: 'none', ...style, }} diff --git a/packages/desktop-client/src/components/mobile/accounts/Accounts.jsx b/packages/desktop-client/src/components/mobile/accounts/Accounts.jsx index 3ecc0867080434cf412204a726e091f56b1cd021..0625bcfa459cc79aad8d786f2eef917527542723 100644 --- a/packages/desktop-client/src/components/mobile/accounts/Accounts.jsx +++ b/packages/desktop-client/src/components/mobile/accounts/Accounts.jsx @@ -37,8 +37,7 @@ function AccountHeader({ name, amount, style = {} }) { <Text style={{ ...styles.text, - textTransform: 'uppercase', - fontSize: 13, + fontSize: 14, }} data-testid="name" > @@ -47,7 +46,7 @@ function AccountHeader({ name, amount, style = {} }) { </View> <CellValue binding={amount} - style={{ ...styles.text, fontSize: 13 }} + style={{ ...styles.text, fontSize: 14 }} type="financial" /> </View> @@ -220,7 +219,7 @@ function AccountList({ {offbudgetAccounts.length > 0 && ( <AccountHeader - name="Off budget" + name="Off Budget" amount={getOffBudgetBalance()} style={{ marginTop: 30 }} /> diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx index b5d64af8af9ef5ac6c951455feeac02db5dcf064..d25e3f9c5e5cb8725968a2f85d497a92167a88b4 100644 --- a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx +++ b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx @@ -43,7 +43,7 @@ function ToBudget({ toBudget, onClick }) { onClick={onClick} > <Label - title={amount < 0 ? 'OVERBUDGETED' : 'TO BUDGET'} + title={amount < 0 ? 'Overbudgeted' : 'To Budget'} style={{ ...styles.underlinedText, color: theme.formInputText, @@ -82,18 +82,32 @@ function Saved({ projected, onClick }) { onClick={onClick} > {projected ? ( - <Label - title="PROJECTED SAVINGS" - style={{ - ...styles.underlinedText, - color: theme.formInputText, - textAlign: 'left', - fontSize: 9, - }} - /> + <> + <Label + title="Projected" + style={{ + ...styles.underlinedText, + color: theme.formInputText, + textAlign: 'left', + letterSpacing: 2, + fontSize: 8, + marginBottom: 0, + }} + /> + <Label + title="Savings" + style={{ + ...styles.underlinedText, + color: theme.formInputText, + textAlign: 'left', + letterSpacing: 2, + fontSize: 8, + }} + /> + </> ) : ( <Label - title={isNegative ? 'OVERSPENT' : 'SAVED'} + title={isNegative ? 'Overspent' : 'Saved'} style={{ ...styles.underlinedText, color: theme.formInputText, @@ -267,7 +281,7 @@ const ExpenseCategory = memo(function ExpenseCategory({ const onTransfer = () => { dispatch( pushModal('transfer', { - title: `Transfer: ${category.name}`, + title: category.name, month, amount: catBalance, onSubmit: (amount, toCategoryId) => { @@ -993,8 +1007,8 @@ function IncomeGroup({ marginRight: 14, }} > - {type === 'report' && <Label title="BUDGETED" style={{ width: 90 }} />} - <Label title="RECEIVED" style={{ width: 90 }} /> + {type === 'report' && <Label title="Budgeted" style={{ width: 90 }} />} + <Label title="Received" style={{ width: 90 }} /> </View> <Card style={{ marginTop: 0 }}> @@ -1270,7 +1284,7 @@ export function BudgetTable({ }} > <Label - title="BUDGETED" + title="Budgeted" style={{ color: theme.buttonNormalText }} /> <CellValue @@ -1313,7 +1327,7 @@ export function BudgetTable({ alignItems: 'flex-end', }} > - <Label title="SPENT" style={{ color: theme.formInputText }} /> + <Label title="Spent" style={{ color: theme.formInputText }} /> <CellValue binding={ type === 'report' @@ -1338,7 +1352,7 @@ export function BudgetTable({ alignItems: 'flex-end', }} > - <Label title="BALANCE" style={{ color: theme.formInputText }} /> + <Label title="Balance" style={{ color: theme.formInputText }} /> <CellValue binding={ type === 'report' diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.jsx b/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.jsx index 1eddb932d2fac53cde303f5883e8b92127360ac4..60e71efd5bf53b73cbcd4bebecafa6e041632419 100644 --- a/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.jsx +++ b/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.jsx @@ -95,7 +95,7 @@ export function TransactionListWithBalances({ }} > <Label - title="CLEARED" + title="Cleared" style={{ textAlign: 'center', fontSize: 12 }} /> <CellValue @@ -110,7 +110,7 @@ export function TransactionListWithBalances({ /> </View> <View style={{ flexBasis: '33%' }}> - <Label title="BALANCE" style={{ textAlign: 'center' }} /> + <Label title="Balance" style={{ textAlign: 'center' }} /> <CellValue binding={balance} type="financial" @@ -132,7 +132,7 @@ export function TransactionListWithBalances({ }} > <Label - title="UNCLEARED" + title="Uncleared" style={{ textAlign: 'center', fontSize: 12 }} /> <CellValue diff --git a/packages/desktop-client/src/components/modals/CoverModal.tsx b/packages/desktop-client/src/components/modals/CoverModal.tsx index 228c358d2a45df07c9ba54fc7f0c609ba5372a95..cf427a79d8b8198eef8c3b8db70342cfbd15225c 100644 --- a/packages/desktop-client/src/components/modals/CoverModal.tsx +++ b/packages/desktop-client/src/components/modals/CoverModal.tsx @@ -75,7 +75,7 @@ export function CoverModal({ return ( <Modal - title={`Cover: ${category.name}`} + title={category.name} showHeader focusAfterClose={false} {...modalProps} diff --git a/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx index 8d2d94dd0afcc6f606b847484a626f9120a33b4d..1bd2fb83f4c4253c414df3839e601873cef08c6c 100644 --- a/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx +++ b/packages/desktop-client/src/components/modals/ReportBalanceMenuModal.tsx @@ -7,6 +7,7 @@ import { type CSSProperties, theme, styles } from '../../style'; import { BalanceWithCarryover } from '../budget/BalanceWithCarryover'; import { BalanceMenu } from '../budget/report/BalanceMenu'; import { Modal } from '../common/Modal'; +import { Text } from '../common/Text'; import { View } from '../common/View'; import { type CommonModalProps } from '../Modals'; @@ -36,7 +37,7 @@ export function ReportBalanceMenuModal({ return ( <Modal - title={`Balance: ${category.name}`} + title={category.name} showHeader focusAfterClose={false} {...modalProps} @@ -55,6 +56,14 @@ export function ReportBalanceMenuModal({ marginBottom: 20, }} > + <Text + style={{ + fontSize: 17, + fontWeight: 400, + }} + > + Balance + </Text> <BalanceWithCarryover disabled balanceStyle={{ diff --git a/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx index 1d994f67c07222b117b31c85970322e0e54e03c5..17cdc075fd8000a9d806565708b77dad53f95271 100644 --- a/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx +++ b/packages/desktop-client/src/components/modals/ReportBudgetMenuModal.tsx @@ -11,6 +11,7 @@ import { useCategory } from '../../hooks/useCategory'; import { type CSSProperties, theme, styles } from '../../style'; import { BudgetMenu } from '../budget/report/BudgetMenu'; import { Modal } from '../common/Modal'; +import { Text } from '../common/Text'; import { View } from '../common/View'; import { FocusableAmountInput } from '../mobile/transactions/FocusableAmountInput'; import { type CommonModalProps } from '../Modals'; @@ -51,9 +52,13 @@ export function ReportBudgetMenuModal({ setAmountFocused(true); }, []); + if (!category) { + return null; + } + return ( <Modal - title={`Budget: ${category?.name}`} + title={category.name} showHeader focusAfterClose={false} {...modalProps} @@ -72,6 +77,14 @@ export function ReportBudgetMenuModal({ marginBottom: 20, }} > + <Text + style={{ + fontSize: 17, + fontWeight: 400, + }} + > + Budget + </Text> <FocusableAmountInput value={integerToAmount(budgeted || 0)} focused={amountFocused} diff --git a/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx index 1b66aac343b3614aef7ca38285ea328476b134ef..33f707fdfd246982464aa8e18be11b20489e2c67 100644 --- a/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx +++ b/packages/desktop-client/src/components/modals/RolloverBalanceMenuModal.tsx @@ -7,6 +7,7 @@ import { type CSSProperties, theme, styles } from '../../style'; import { BalanceWithCarryover } from '../budget/BalanceWithCarryover'; import { BalanceMenu } from '../budget/rollover/BalanceMenu'; import { Modal } from '../common/Modal'; +import { Text } from '../common/Text'; import { View } from '../common/View'; import { type CommonModalProps } from '../Modals'; @@ -38,7 +39,7 @@ export function RolloverBalanceMenuModal({ return ( <Modal - title={`Balance: ${category.name}`} + title={category.name} showHeader focusAfterClose={false} {...modalProps} @@ -57,6 +58,14 @@ export function RolloverBalanceMenuModal({ marginBottom: 20, }} > + <Text + style={{ + fontSize: 17, + fontWeight: 400, + }} + > + Balance + </Text> <BalanceWithCarryover disabled balanceStyle={{ diff --git a/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx index c06e91781473e89665a35d16ce1d2be71512d2c7..0130b6d3f6b4ce9238058d088aa0977f2f057de6 100644 --- a/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx +++ b/packages/desktop-client/src/components/modals/RolloverBudgetMenuModal.tsx @@ -11,6 +11,7 @@ import { useCategory } from '../../hooks/useCategory'; import { type CSSProperties, theme, styles } from '../../style'; import { BudgetMenu } from '../budget/rollover/BudgetMenu'; import { Modal } from '../common/Modal'; +import { Text } from '../common/Text'; import { View } from '../common/View'; import { FocusableAmountInput } from '../mobile/transactions/FocusableAmountInput'; import { type CommonModalProps } from '../Modals'; @@ -51,9 +52,13 @@ export function RolloverBudgetMenuModal({ setAmountFocused(true); }, []); + if (!category) { + return null; + } + return ( <Modal - title={`Budget: ${category?.name}`} + title={category.name} showHeader focusAfterClose={false} {...modalProps} @@ -72,6 +77,14 @@ export function RolloverBudgetMenuModal({ marginBottom: 20, }} > + <Text + style={{ + fontSize: 17, + fontWeight: 400, + }} + > + Budget + </Text> <FocusableAmountInput value={integerToAmount(budgeted || 0)} focused={amountFocused} diff --git a/upcoming-release-notes/2627.md b/upcoming-release-notes/2627.md new file mode 100644 index 0000000000000000000000000000000000000000..95d7d68c53eca581b93b75acb201acc7b2895e2b --- /dev/null +++ b/upcoming-release-notes/2627.md @@ -0,0 +1,6 @@ +--- +category: Enhancements +authors: [joel-jeremy] +--- + +Mobile - make labels sentence case and update budget and balance modals with Budget and Balance labels respectively.