From 46401e4bd2a79147d746839ae039142a14ed0571 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 17 May 2024 10:38:45 +0700 Subject: [PATCH 1/2] fix: Split scan - Excessive header space in split menu --- ios/Podfile.lock | 2 +- src/components/MoneyRequestHeaderStatusBar.tsx | 7 +++++-- src/pages/iou/SplitBillDetailsPage.tsx | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d0155051fc3b..723d46b1f168 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2577,4 +2577,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: a25a81f2b50270f0c0bd0aff2e2ebe4d0b4ec06d -COCOAPODS: 1.13.0 +COCOAPODS: 1.14.3 diff --git a/src/components/MoneyRequestHeaderStatusBar.tsx b/src/components/MoneyRequestHeaderStatusBar.tsx index 4ee3079d5f1f..a70d5a8521b7 100644 --- a/src/components/MoneyRequestHeaderStatusBar.tsx +++ b/src/components/MoneyRequestHeaderStatusBar.tsx @@ -17,9 +17,12 @@ type MoneyRequestHeaderStatusBarProps = { /** Whether we should use the danger theme color */ danger?: boolean; + + /** Whether we style flex grow */ + shouldStyleFlexGrow?: boolean; }; -function MoneyRequestHeaderStatusBar({title, description, shouldShowBorderBottom, danger = false}: MoneyRequestHeaderStatusBarProps) { +function MoneyRequestHeaderStatusBar({title, description, shouldShowBorderBottom, danger = false, shouldStyleFlexGrow = true}: MoneyRequestHeaderStatusBarProps) { const styles = useThemeStyles(); const borderBottomStyle = shouldShowBorderBottom ? styles.borderBottom : {}; return ( @@ -28,7 +31,7 @@ function MoneyRequestHeaderStatusBar({title, description, shouldShowBorderBottom styles.dFlex, styles.flexRow, styles.alignItemsCenter, - styles.flexGrow1, + shouldStyleFlexGrow && styles.flexGrow1, styles.overflowHidden, styles.ph5, styles.pb3, diff --git a/src/pages/iou/SplitBillDetailsPage.tsx b/src/pages/iou/SplitBillDetailsPage.tsx index 51b432d7e860..7d0b9bb15b07 100644 --- a/src/pages/iou/SplitBillDetailsPage.tsx +++ b/src/pages/iou/SplitBillDetailsPage.tsx @@ -103,6 +103,7 @@ function SplitBillDetailsPage({personalDetails, report, route, reportActions, tr title={translate('iou.receiptStatusTitle')} description={translate('iou.receiptStatusText')} shouldShowBorderBottom + shouldStyleFlexGrow={false} /> )} {!!participants.length && ( From e4ae5313b03e501d2c36476389bbab60c4e0eaab Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Fri, 17 May 2024 10:48:54 +0700 Subject: [PATCH 2/2] fix: podfile --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 723d46b1f168..d0155051fc3b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2577,4 +2577,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: a25a81f2b50270f0c0bd0aff2e2ebe4d0b4ec06d -COCOAPODS: 1.14.3 +COCOAPODS: 1.13.0