From 6f25d93873c33b05bfd5af73178ce3220bcf6667 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Tue, 4 Feb 2025 13:11:25 +0800 Subject: [PATCH 1/7] resize the container of each column so the per-diem amount is not wrapped --- src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx index 1f51af583d8a..06ed38525824 100644 --- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx +++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx @@ -170,7 +170,7 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { pendingAction: value.pendingAction, rightElement: ( <> - + {value.subRateName} @@ -205,10 +205,10 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { const getCustomListHeader = () => ( - + {translate('common.destination')} - + {translate('common.subrate')} @@ -419,7 +419,7 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { customListHeader={getCustomListHeader()} listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]} listHeaderContent={shouldUseNarrowLayout ? getHeaderText() : null} - listItemTitleContainerStyles={styles.flex3} + listItemTitleContainerStyles={styles.flex1} showScrollIndicator={false} /> )} From add205455207999450dd42ded166afe18c2ebb7a Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Tue, 4 Feb 2025 13:18:45 +0800 Subject: [PATCH 2/7] lint --- src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx index 06ed38525824..866827849b6b 100644 --- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx +++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx @@ -180,7 +180,7 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { ), }; }), - [allSubRates, selectedPerDiem, canSelectMultiple, styles.flex2, styles.alignItemsStart, styles.textSupporting, styles.label, styles.pl2, styles.flex1, styles.alignSelfEnd], + [allSubRates, selectedPerDiem, canSelectMultiple, styles.alignItemsStart, styles.textSupporting, styles.label, styles.pl2, styles.flex1, styles.alignSelfEnd], ); const toggleSubRate = (subRate: PolicyOption) => { From a57dd0368565b832236c4b8be28bcef4c792b86d Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 5 Feb 2025 13:01:44 +0800 Subject: [PATCH 3/7] rescale the flex weights --- src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx index 866827849b6b..c6b6e1dc59d6 100644 --- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx +++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx @@ -170,10 +170,10 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { pendingAction: value.pendingAction, rightElement: ( <> - + {value.subRateName} - + {convertAmountToDisplayString(value.rate, value.currency)} @@ -205,13 +205,13 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { const getCustomListHeader = () => ( - + {translate('common.destination')} - + {translate('common.subrate')} - + {translate('workspace.perDiem.amount')} @@ -419,7 +419,7 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { customListHeader={getCustomListHeader()} listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]} listHeaderContent={shouldUseNarrowLayout ? getHeaderText() : null} - listItemTitleContainerStyles={styles.flex1} + listItemTitleContainerStyles={styles.flex3} showScrollIndicator={false} /> )} From 16c6cbbf8e82e83df2578d471d656cde300143bd Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 5 Feb 2025 13:03:09 +0800 Subject: [PATCH 4/7] set max line to 1 --- src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx index c6b6e1dc59d6..19278615b885 100644 --- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx +++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx @@ -174,7 +174,12 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { {value.subRateName} - {convertAmountToDisplayString(value.rate, value.currency)} + + {convertAmountToDisplayString(value.rate, value.currency)} + ), From facb60b381a0cc2df82587638d18fc74cb693728 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 5 Feb 2025 13:09:09 +0800 Subject: [PATCH 5/7] missing deps --- src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx index 19278615b885..9b6f12f31e8a 100644 --- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx +++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx @@ -185,7 +185,7 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { ), }; }), - [allSubRates, selectedPerDiem, canSelectMultiple, styles.alignItemsStart, styles.textSupporting, styles.label, styles.pl2, styles.flex1, styles.alignSelfEnd], + [allSubRates, selectedPerDiem, canSelectMultiple, styles.flex2, styles.alignItemsStart, styles.textSupporting, styles.label, styles.pl2, styles.flex1, styles.alignSelfEnd], ); const toggleSubRate = (subRate: PolicyOption) => { From 0c56f83596d2370399947109b2b4f35acfd367d8 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Wed, 5 Feb 2025 13:10:01 +0800 Subject: [PATCH 6/7] remove unnecessary deps --- src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx index 9b6f12f31e8a..a517095c30c0 100644 --- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx +++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx @@ -185,7 +185,7 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { ), }; }), - [allSubRates, selectedPerDiem, canSelectMultiple, styles.flex2, styles.alignItemsStart, styles.textSupporting, styles.label, styles.pl2, styles.flex1, styles.alignSelfEnd], + [allSubRates, selectedPerDiem, canSelectMultiple, styles.flex2, styles.alignItemsStart, styles.textSupporting, styles.label, styles.pl2, styles.alignSelfEnd], ); const toggleSubRate = (subRate: PolicyOption) => { From 91ef4cd2674ef40b195673d928db231aba56a594 Mon Sep 17 00:00:00 2001 From: Bernhard Owen Josephus Date: Thu, 6 Feb 2025 12:47:22 +0800 Subject: [PATCH 7/7] limit max line to 1 for subrate name too --- src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx index a517095c30c0..79dbd8c62fb9 100644 --- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx +++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx @@ -171,7 +171,12 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) { rightElement: ( <> - {value.subRateName} + + {value.subRateName} +