Merge pull request #8493 from thesahindia/thesahindia/show-confirmati…

…on-screen show confirmation screen on password change
Expensify · Apr 29, 2022 · 11072a6 · 11072a6
2 parents 69e3e28 + e27e246
commit 11072a6
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 70 deletions.
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -339,6 +339,11 @@ export default {
             newPassword: 'Your password must have at least 8 characters, 1 capital letter, 1 lowercase letter, and 1 number.',
         },
     },
+    passwordConfirmationScreen: {
+        passwordUpdated: 'Password updated!',
+        allSet: 'You’re all set. Keep your new password safe.',
+        gotIt: 'Got it',
+    },
     addPayPalMePage: {
         enterYourUsernameToGetPaidViaPayPal: 'Enter your username to get paid back via PayPal.',
         payPalMe: 'PayPal.me/',

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -339,6 +339,11 @@ export default {
             newPassword: 'Su contraseña debe tener al menos 8 caracteres, 1 letra mayúscula, 1 letra minúscula y 1 número.',
         },
     },
+    passwordConfirmationScreen: {
+        passwordUpdated: 'Contraseña actualizada!',
+        allSet: 'Todo está listo. Guarda tu contraseña en un lugar seguro.',
+        gotIt: 'Ok, entendido',
+    },
     addPayPalMePage: {
         enterYourUsernameToGetPaidViaPayPal: 'Escribe tu nombre de usuario para que otros puedan pagarte a través de PayPal.',
         payPalMe: 'PayPal.me/',

diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
@@ -56,7 +56,8 @@ function changePasswordAndNavigate(oldPassword, password) {
                 return;
             }
 
-            Navigation.goBack();
+            const success = lodashGet(response, 'message', 'Password changed successfully.');
+            Onyx.merge(ONYXKEYS.ACCOUNT, {success});
         })
         .finally(() => {
             Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});

diff --git a/src/pages/settings/PasswordConfirmationScreen.js b/src/pages/settings/PasswordConfirmationScreen.js
@@ -0,0 +1,50 @@
+import React from 'react';
+import {Image, View} from 'react-native';
+import Text from '../../components/Text';
+import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
+import styles from '../../styles/styles';
+import confettiPop from '../../../assets/images/confetti-pop.gif';
+import Button from '../../components/Button';
+import FixedFooter from '../../components/FixedFooter';
+import Navigation from '../../libs/Navigation/Navigation';
+
+const propTypes = {
+    ...withLocalizePropTypes,
+};
+
+const PasswordConfirmationScreen = props => (
+    <>
+        <View style={[styles.screenCenteredContainer, styles.alignItemsCenter]}>
+            <Image
+                source={confettiPop}
+                style={styles.confettiIcon}
+            />
+            <Text
+                style={[
+                    styles.textStrong,
+                    styles.textLarge,
+                    styles.mb2,
+                ]}
+            >
+                {props.translate('passwordConfirmationScreen.passwordUpdated')}
+            </Text>
+            <Text style={styles.textAlignCenter}>
+                {props.translate('passwordConfirmationScreen.allSet')}
+            </Text>
+        </View>
+        <FixedFooter>
+            <Button
+                success
+                text={props.translate('passwordConfirmationScreen.gotIt')}
+                style={styles.mt6}
+                pressOnEnter
+                onPress={() => Navigation.goBack()}
+            />
+        </FixedFooter>
+    </>
+);
+
+PasswordConfirmationScreen.propTypes = propTypes;
+PasswordConfirmationScreen.displayName = 'PasswordConfirmationScreen';
+
+export default withLocalize(PasswordConfirmationScreen);
diff --git a/src/pages/settings/PasswordPage.js b/src/pages/settings/PasswordPage.js
@@ -3,10 +3,8 @@ import {View, ScrollView} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
 import _ from 'underscore';
-
 import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
 import Navigation from '../../libs/Navigation/Navigation';
-import ROUTES from '../../ROUTES';
 import ScreenWrapper from '../../components/ScreenWrapper';
 import Text from '../../components/Text';
 import styles from '../../styles/styles';
@@ -20,6 +18,7 @@ import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
 import FixedFooter from '../../components/FixedFooter';
 import TextInput from '../../components/TextInput';
 import * as Session from '../../libs/actions/Session';
+import PasswordConfirmationScreen from './PasswordConfirmationScreen';
 
 const propTypes = {
     /* Onyx Props */
@@ -152,77 +151,81 @@ class PasswordPage extends Component {
                     <HeaderWithCloseButton
                         title={this.props.translate('passwordPage.changePassword')}
                         shouldShowBackButton
-                        onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS_SECURITY)}
+                        onBackButtonPress={() => Navigation.goBack()}
                         onCloseButtonPress={() => Navigation.dismissModal(true)}
                     />
-                    <ScrollView
-                        style={styles.flex1}
-                        contentContainerStyle={styles.p5}
-
-                        // Allow the user to click show password while password input is focused.
-                        // eslint-disable-next-line react/jsx-props-no-multi-spaces
-                        keyboardShouldPersistTaps="always"
-                    >
-                        <Text style={[styles.mb6]}>
-                            {this.props.translate('passwordPage.changingYourPasswordPrompt')}
-                        </Text>
-                        <View style={styles.mb6}>
-                            <TextInput
-                                label={`${this.props.translate('passwordPage.currentPassword')}*`}
-                                ref={el => this.currentPasswordInputRef = el}
-                                secureTextEntry
-                                autoCompleteType="password"
-                                textContentType="password"
-                                value={this.state.currentPassword}
-                                onChangeText={text => this.clearErrorAndSetValue('currentPassword', text)}
-                                returnKeyType="done"
-                                hasError={this.state.errors.currentPassword}
-                                errorText={this.getErrorText('currentPassword')}
-                                onSubmitEditing={this.submit}
-                            />
-                        </View>
-                        <View style={styles.mb6}>
-                            <TextInput
-                                label={`${this.props.translate('passwordPage.newPassword')}*`}
-                                secureTextEntry
-                                autoCompleteType="password"
-                                textContentType="password"
-                                value={this.state.newPassword}
-                                hasError={this.state.errors.newPassword || this.state.errors.newPasswordSameAsOld}
-                                errorText={this.state.errors.newPasswordSameAsOld
-                                    ? this.getErrorText('newPasswordSameAsOld')
-                                    : this.getErrorText('newPassword')}
-                                onChangeText={text => this.clearErrorAndSetValue('newPassword', text, ['newPasswordSameAsOld'])}
-                                onSubmitEditing={this.submit}
-                            />
-                            {
-
-                                shouldShowNewPasswordPrompt && (
-                                <Text
-                                    style={[
-                                        styles.textLabelSupporting,
-                                        styles.mt1,
-                                    ]}
+                    {!_.isEmpty(this.props.account.success)
+                        ? (
+                            <PasswordConfirmationScreen />
+                        ) : (
+                            <>
+                                <ScrollView
+                                    style={styles.flex1}
+                                    contentContainerStyle={styles.p5}
+
+                                    // Allow the user to click show password while password input is focused.
+                                    // eslint-disable-next-line react/jsx-props-no-multi-spaces
+                                    keyboardShouldPersistTaps="always"
                                 >
-                                    {this.props.translate('passwordPage.newPasswordPrompt')}
-                                </Text>
-                                )
-                            }
-                        </View>
-                        {_.every(this.state.errors, error => !error) && !_.isEmpty(this.props.account.error) && (
-                            <Text style={styles.formError}>
-                                {this.props.account.error}
-                            </Text>
+                                    <Text style={[styles.mb6]}>
+                                        {this.props.translate('passwordPage.changingYourPasswordPrompt')}
+                                    </Text>
+                                    <View style={styles.mb6}>
+                                        <TextInput
+                                            label={`${this.props.translate('passwordPage.currentPassword')}*`}
+                                            ref={el => this.currentPasswordInputRef = el}
+                                            secureTextEntry
+                                            autoCompleteType="password"
+                                            textContentType="password"
+                                            value={this.state.currentPassword}
+                                            onChangeText={text => this.clearErrorAndSetValue('currentPassword', text)}
+                                            returnKeyType="done"
+                                            hasError={this.state.errors.currentPassword}
+                                            errorText={this.getErrorText('currentPassword')}
+                                            onSubmitEditing={this.submit}
+                                        />
+                                    </View>
+                                    <View style={styles.mb6}>
+                                        <TextInput
+                                            label={`${this.props.translate('passwordPage.newPassword')}*`}
+                                            secureTextEntry
+                                            autoCompleteType="password"
+                                            textContentType="password"
+                                            value={this.state.newPassword}
+                                            hasError={this.state.errors.newPassword || this.state.errors.newPasswordSameAsOld}
+                                            errorText={this.state.errors.newPasswordSameAsOld
+                                                ? this.getErrorText('newPasswordSameAsOld')
+                                                : this.getErrorText('newPassword')}
+                                            onChangeText={text => this.clearErrorAndSetValue('newPassword', text, ['newPasswordSameAsOld'])}
+                                            onSubmitEditing={this.submit}
+                                        />
+                                        {shouldShowNewPasswordPrompt && (
+                                        <Text
+                                            style={[
+                                                styles.textLabelSupporting,
+                                                styles.mt1,
+                                            ]}
+                                        >
+                                            {this.props.translate('passwordPage.newPasswordPrompt')}
+                                        </Text>
+                                        )}
+                                    </View>
+                                    {_.every(this.state.errors, error => !error) && !_.isEmpty(this.props.account.error) && (
+                                    <Text style={styles.formError}>
+                                        {this.props.account.error}
+                                    </Text>
+                                    )}
+                                </ScrollView>
+                                <FixedFooter style={[styles.flexGrow0]}>
+                                    <Button
+                                        success
+                                        isLoading={this.props.account.loading}
+                                        text={this.props.translate('common.save')}
+                                        onPress={this.submit}
+                                    />
+                                </FixedFooter>
+                            </>
                         )}
-                    </ScrollView>
-                    <FixedFooter style={[styles.flexGrow0]}>
-                        <Button
-                            success
-                            isLoading={this.props.account.loading}
-                            text={this.props.translate('common.save')}
-                            onPress={this.submit}
-                        />
-                    </FixedFooter>
                 </KeyboardAvoidingView>
             </ScreenWrapper>
         );

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -2512,6 +2512,13 @@ const styles = {
     userSelectText: {
         userSelect: 'text',
     },
+
+    screenCenteredContainer: {
+        flex: 1,
+        justifyContent: 'center',
+        marginBottom: 40,
+        padding: 16,
+    },
 };
 
 export default styles;