From 407d9528dbe1e1068aac237c98f5ae050b3c2d24 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Fri, 19 Jul 2024 11:20:10 +0200
Subject: [PATCH 1/5] fix: move to expensifyCard folder

---
 src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx | 2 +-
 .../workspace/{card => expensifyCard}/issueNew/AssigneeStep.tsx | 0
 .../workspace/{card => expensifyCard}/issueNew/CardNameStep.tsx | 0
 .../workspace/{card => expensifyCard}/issueNew/CardTypeStep.tsx | 0
 .../{card => expensifyCard}/issueNew/ConfirmationStep.tsx       | 0
 .../{card => expensifyCard}/issueNew/IssueNewCardPage.tsx       | 0
 .../workspace/{card => expensifyCard}/issueNew/LimitStep.tsx    | 0
 .../{card => expensifyCard}/issueNew/LimitTypeStep.tsx          | 0
 8 files changed, 1 insertion(+), 1 deletion(-)
 rename src/pages/workspace/{card => expensifyCard}/issueNew/AssigneeStep.tsx (100%)
 rename src/pages/workspace/{card => expensifyCard}/issueNew/CardNameStep.tsx (100%)
 rename src/pages/workspace/{card => expensifyCard}/issueNew/CardTypeStep.tsx (100%)
 rename src/pages/workspace/{card => expensifyCard}/issueNew/ConfirmationStep.tsx (100%)
 rename src/pages/workspace/{card => expensifyCard}/issueNew/IssueNewCardPage.tsx (100%)
 rename src/pages/workspace/{card => expensifyCard}/issueNew/LimitStep.tsx (100%)
 rename src/pages/workspace/{card => expensifyCard}/issueNew/LimitTypeStep.tsx (100%)

diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 6a89d4bb0851..e0301a5f4128 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -413,7 +413,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.WORKSPACE.TAX_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/ValuePage').default,
     [SCREENS.WORKSPACE.TAX_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceCreateTaxPage').default,
     [SCREENS.WORKSPACE.TAX_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceTaxCodePage').default,
-    [SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW]: () => require<ReactComponentModule>('../../../../pages/workspace/card/issueNew/IssueNewCardPage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/issueNew/IssueNewCardPage').default,
     [SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts').default,
     [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage').default,
     [SCREENS.SETTINGS.SAVE_THE_WORLD]: () => require<ReactComponentModule>('../../../../pages/TeachersUnite/SaveTheWorldPage').default,
diff --git a/src/pages/workspace/card/issueNew/AssigneeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
similarity index 100%
rename from src/pages/workspace/card/issueNew/AssigneeStep.tsx
rename to src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
diff --git a/src/pages/workspace/card/issueNew/CardNameStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
similarity index 100%
rename from src/pages/workspace/card/issueNew/CardNameStep.tsx
rename to src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
diff --git a/src/pages/workspace/card/issueNew/CardTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx
similarity index 100%
rename from src/pages/workspace/card/issueNew/CardTypeStep.tsx
rename to src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx
diff --git a/src/pages/workspace/card/issueNew/ConfirmationStep.tsx b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
similarity index 100%
rename from src/pages/workspace/card/issueNew/ConfirmationStep.tsx
rename to src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
diff --git a/src/pages/workspace/card/issueNew/IssueNewCardPage.tsx b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
similarity index 100%
rename from src/pages/workspace/card/issueNew/IssueNewCardPage.tsx
rename to src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
diff --git a/src/pages/workspace/card/issueNew/LimitStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
similarity index 100%
rename from src/pages/workspace/card/issueNew/LimitStep.tsx
rename to src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
diff --git a/src/pages/workspace/card/issueNew/LimitTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
similarity index 100%
rename from src/pages/workspace/card/issueNew/LimitTypeStep.tsx
rename to src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx

From e969c68ce85e140c8b176c440705ec4b124be74d Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Fri, 19 Jul 2024 11:28:14 +0200
Subject: [PATCH 2/5] fix: style fixes

---
 src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx | 2 +-
 src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
index 787e564676f4..c063f4246a56 100644
--- a/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
@@ -67,7 +67,7 @@ function ConfirmationStep() {
                 contentContainerStyle={styles.flexGrow1}
             >
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.letsDoubleCheck')}</Text>
-                <Text style={[styles.textLabelSupporting, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.willBeReady')}</Text>
+                <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.willBeReady')}</Text>
                 <MenuItemWithTopDescription
                     description={translate('workspace.card.issueNewCard.cardholder')}
                     title={PersonalDetailsUtils.getPersonalDetailByEmail(data?.assigneeEmail ?? '')?.displayName}
diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
index 79b9c40ef4ae..42c4e8668c34 100644
--- a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
@@ -106,6 +106,7 @@ function LimitTypeStep({policy}: LimitTypeStepProps) {
                 onSelectRow={({value}) => setTypeSelected(value)}
                 sections={[{data}]}
                 shouldDebounceRowSelect
+                initiallyFocusedOptionKey={typeSelected}
             />
             <Button
                 success

From 5430694a832c70b0541dff5d12242f5a204f00e5 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Tue, 23 Jul 2024 11:06:46 +0200
Subject: [PATCH 3/5] fix: style adjustments

---
 src/pages/workspace/expensifyCard/EmptyCardView.tsx          | 4 ++--
 src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/expensifyCard/EmptyCardView.tsx b/src/pages/workspace/expensifyCard/EmptyCardView.tsx
index 9e82454f0509..f058b9241853 100644
--- a/src/pages/workspace/expensifyCard/EmptyCardView.tsx
+++ b/src/pages/workspace/expensifyCard/EmptyCardView.tsx
@@ -23,12 +23,12 @@ function EmptyCardView() {
 
     return (
         <ScrollView>
-            <View style={{height: windowHeight - headerHeight}}>
+            <View style={[{height: windowHeight - headerHeight}, styles.mt5]}>
                 <EmptyStateComponent
                     SkeletonComponent={CardRowSkeleton}
                     headerMediaType={CONST.EMPTY_STATE_MEDIA.ILLUSTRATION}
                     headerMedia={Illustrations.EmptyCardState}
-                    headerStyles={[{overflow: 'hidden'}, isSmallScreenWidth && {maxHeight: 300}]}
+                    headerStyles={[{overflow: 'hidden'}, isSmallScreenWidth && {maxHeight: 350}]}
                     title={translate('workspace.expensifyCard.issueAndManageCards')}
                     subtitle={translate('workspace.expensifyCard.getStartedIssuing')}
                     emptyStateContentStyles={isSmallScreenWidth ? {top: -BUTTON_HEIGHT} : undefined}
diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
index 42c4e8668c34..5bdce155da0b 100644
--- a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
@@ -107,6 +107,7 @@ function LimitTypeStep({policy}: LimitTypeStepProps) {
                 sections={[{data}]}
                 shouldDebounceRowSelect
                 initiallyFocusedOptionKey={typeSelected}
+                shouldUpdateFocusedIndex
             />
             <Button
                 success

From 398d54c8473032899514f6f0316fa940bc931618 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Tue, 23 Jul 2024 12:57:27 +0200
Subject: [PATCH 4/5] fix: android image issue

---
 src/components/EmptyStateComponent/index.tsx        |  6 +++---
 src/components/EmptyStateComponent/types.ts         |  2 +-
 src/pages/workspace/expensifyCard/EmptyCardView.tsx | 11 +++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/EmptyStateComponent/index.tsx b/src/components/EmptyStateComponent/index.tsx
index 41d1a42931c6..56f8fa5e3d83 100644
--- a/src/components/EmptyStateComponent/index.tsx
+++ b/src/components/EmptyStateComponent/index.tsx
@@ -24,7 +24,7 @@ function EmptyStateComponent({
     subtitle,
     headerStyles,
     headerContentStyles,
-    emptyStateContentStyles,
+    emptyStateForegroundStyles,
 }: EmptyStateComponentProps) {
     const styles = useThemeStyles();
     const {isSmallScreenWidth} = useWindowDimensions();
@@ -86,8 +86,8 @@ function EmptyStateComponent({
                     shouldAnimate={false}
                 />
             </View>
-            <View style={styles.emptyStateForeground(isSmallScreenWidth)}>
-                <View style={[styles.emptyStateContent, emptyStateContentStyles]}>
+            <View style={[styles.emptyStateForeground(isSmallScreenWidth), emptyStateForegroundStyles]}>
+                <View style={styles.emptyStateContent}>
                     <View style={[styles.emptyStateHeader(headerMediaType === CONST.EMPTY_STATE_MEDIA.ILLUSTRATION), headerStyles]}>{HeaderComponent}</View>
                     <View style={styles.p8}>
                         <Text style={[styles.textAlignCenter, styles.textHeadlineH1, styles.mb2]}>{title}</Text>
diff --git a/src/components/EmptyStateComponent/types.ts b/src/components/EmptyStateComponent/types.ts
index 96a60fa98513..258e8a610e16 100644
--- a/src/components/EmptyStateComponent/types.ts
+++ b/src/components/EmptyStateComponent/types.ts
@@ -19,7 +19,7 @@ type SharedProps<T> = {
     headerStyles?: StyleProp<ViewStyle>;
     headerMediaType: T;
     headerContentStyles?: StyleProp<ViewStyle & ImageStyle>;
-    emptyStateContentStyles?: StyleProp<ViewStyle>;
+    emptyStateForegroundStyles?: StyleProp<ViewStyle>;
 };
 
 type MediaType<HeaderMedia, T extends MediaTypes> = SharedProps<T> & {
diff --git a/src/pages/workspace/expensifyCard/EmptyCardView.tsx b/src/pages/workspace/expensifyCard/EmptyCardView.tsx
index f058b9241853..a7d2b9949703 100644
--- a/src/pages/workspace/expensifyCard/EmptyCardView.tsx
+++ b/src/pages/workspace/expensifyCard/EmptyCardView.tsx
@@ -8,6 +8,7 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import colors from '@styles/theme/colors';
 import CONST from '@src/CONST';
 
 const HEADER_HEIGHT = 80;
@@ -28,10 +29,16 @@ function EmptyCardView() {
                     SkeletonComponent={CardRowSkeleton}
                     headerMediaType={CONST.EMPTY_STATE_MEDIA.ILLUSTRATION}
                     headerMedia={Illustrations.EmptyCardState}
-                    headerStyles={[{overflow: 'hidden'}, isSmallScreenWidth && {maxHeight: 350}]}
+                    headerStyles={[
+                        {
+                            overflow: 'hidden',
+                            backgroundColor: colors.green700,
+                        },
+                        isSmallScreenWidth && {maxHeight: 250},
+                    ]}
                     title={translate('workspace.expensifyCard.issueAndManageCards')}
                     subtitle={translate('workspace.expensifyCard.getStartedIssuing')}
-                    emptyStateContentStyles={isSmallScreenWidth ? {top: -BUTTON_HEIGHT} : undefined}
+                    emptyStateForegroundStyles={isSmallScreenWidth && {justifyContent: 'flex-start'}}
                 />
             </View>
             <Text style={[styles.textMicroSupporting, styles.m5]}>{translate('workspace.expensifyCard.disclaimer')}</Text>

From c14b139c6893ec5f33e23fd4449981e463da8892 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Wed, 24 Jul 2024 11:06:48 +0200
Subject: [PATCH 5/5] fix: apply requested changes

---
 src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx | 3 +--
 src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx    | 6 +++---
 .../workspace/expensifyCard/issueNew/LimitTypeStep.tsx      | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
index 58b0748e438a..556f512c725d 100644
--- a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
@@ -75,8 +75,7 @@ function CardNameStep() {
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.giveItName')}</Text>
             <FormProvider
                 formID={ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM}
-                // TODO: change the submitButtonText to 'common.confirm' when editing and navigate to ConfirmationStep
-                submitButtonText={translate('common.next')}
+                submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
                 onSubmit={submit}
                 validate={validate}
                 style={[styles.mh5, styles.flexGrow1]}
diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
index 5f97db54ff21..eb7c2e7d8e0f 100644
--- a/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
@@ -79,15 +79,15 @@ function LimitStep() {
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.setLimit')}</Text>
             <FormProvider
                 formID={ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM}
-                // TODO: change the submitButtonText to 'common.confirm' when editing and navigate to ConfirmationStep
-                submitButtonText={translate('common.next')}
+                submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
                 shouldHideFixErrorsAlert
                 onSubmit={submit}
                 style={[styles.flex1]}
                 submitButtonStyles={[styles.mh5, styles.mt0]}
                 submitFlexEnabled={false}
-                enabledWhenOffline
+                disablePressOnEnter={false}
                 validate={validate}
+                enabledWhenOffline
             >
                 <InputWrapper
                     InputComponent={AmountForm}
diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
index 5bdce155da0b..4f4d2e26db27 100644
--- a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
+++ b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
@@ -113,8 +113,7 @@ function LimitTypeStep({policy}: LimitTypeStepProps) {
                 success
                 large
                 pressOnEnter
-                // TODO: change the text to 'common.confirm' when editing and navigate to ConfirmationStep
-                text={translate('common.next')}
+                text={translate(isEditing ? 'common.confirm' : 'common.next')}
                 onPress={submit}
                 style={styles.m5}
             />