Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {setIssueNewCardStepAndData} from '@userActions/Card';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import INPUT_IDS from '@src/types/form/IssueNewExpensifyCardForm';
import KeyboardUtils from '@src/utils/keyboard';

type CardNameStepProps = {
/** ID of the policy */
Expand Down Expand Up @@ -52,24 +53,28 @@ function CardNameStep({policyID, stepNames, startStepIndex}: CardNameStepProps)

const submit = useCallback(
(values: FormOnyxValues<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM>) => {
setIssueNewCardStepAndData({
step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION,
data: {
cardTitle: values.cardTitle,
},
isEditing: false,
policyID,
KeyboardUtils.dismiss().then(() => {
setIssueNewCardStepAndData({
step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION,
data: {
cardTitle: values.cardTitle,
},
isEditing: false,
policyID,
});
});
},
[policyID],
);

const handleBackButtonPress = useCallback(() => {
if (isEditing) {
setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false, policyID});
return;
}
setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.LIMIT, policyID});
KeyboardUtils.dismiss().then(() => {
if (isEditing) {
setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false, policyID});
return;
}
setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.LIMIT, policyID});
});
}, [isEditing, policyID]);

return (
Expand Down
Loading