Skip to content

Commit ae7a1c0

Browse files
authored
Merge pull request Expensify#64716 from hoangzinh/60329-fix-sms-delivery-reset-flash-message
Fix SMS delivery failure reset message flashes for a moment before displaying the time left
2 parents a19c11b + 2ae3ba0 commit ae7a1c0

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/pages/signin/SMSDeliveryFailurePage.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ function SMSDeliveryFailurePage() {
2929
}, [credentials?.login]);
3030

3131
const SMSDeliveryFailureMessage = account?.smsDeliveryFailureStatus?.message;
32+
const isResettingSMSDeliveryFailureStatus = account?.smsDeliveryFailureStatus?.isLoading;
3233

3334
type TimeData = {
3435
days?: number;
@@ -65,7 +66,7 @@ function SMSDeliveryFailurePage() {
6566
Keyboard.dismiss();
6667
}, [isKeyboardShown]);
6768

68-
if (hasSMSDeliveryFailure && hasClickedValidate) {
69+
if (hasSMSDeliveryFailure && hasClickedValidate && !isResettingSMSDeliveryFailureStatus) {
6970
return (
7071
<>
7172
<View style={[styles.mv3, styles.flexRow]}>
@@ -131,7 +132,7 @@ function SMSDeliveryFailurePage() {
131132
<View style={[styles.mv4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsEnd]}>
132133
<FormAlertWithSubmitButton
133134
buttonText={translate('common.validate')}
134-
isLoading={account?.smsDeliveryFailureStatus?.isLoading}
135+
isLoading={isResettingSMSDeliveryFailureStatus}
135136
onSubmit={() => {
136137
resetSMSDeliveryFailureStatus(login);
137138
setHasClickedValidate(true);

0 commit comments

Comments
 (0)