Init pin views when navigating back during pin reset

Author: tanx

src/action/auth-mobile.js

@@ -55,6 +55,17 @@ class AuthAction {
     this._nav.goResetPasswordCurrent();
   }
 
+  /**
+   * Initialize the reset new pin flow by resetting new values
+   * and then navigating to the new pin view.
+   * @return {undefined}
+   */
+  initResetPinNew() {
+    this._store.auth.resetPinNew = '';
+    this._store.auth.resetPinVerify = '';
+    this._nav.goResetPasswordNew();
+  }
+
   /**
    * Append a digit input to the pin parameter.
    * @param  {string} options.digit The digit to append to the pin
@@ -100,8 +111,7 @@ class AuthAction {
     } else if (param === 'resetPinNew') {
       this.initResetPin();
     } else if (param === 'resetPinVerify') {
-      this._store.auth.resetPinNew = '';
-      this._nav.goResetPasswordNew();
+      this.initResetPinNew();
     }
   }
 

src/view/main-mobile.js

@@ -101,12 +101,10 @@ const ResetPasswordCurrent = () => (
   <ResetPinCurrentView store={store} auth={auth} nav={nav} />
 );
 
-const ResetPasswordNew = () => (
-  <ResetPinNewView store={store} auth={auth} nav={nav} />
-);
+const ResetPasswordNew = () => <ResetPinNewView store={store} auth={auth} />;
 
 const ResetPasswordConfirm = () => (
-  <ResetPinConfirmView store={store} auth={auth} nav={nav} />
+  <ResetPinConfirmView store={store} auth={auth} />
 );
 
 const ResetPasswordSaved = () => <ResetPinSavedView nav={nav} />;

src/view/reset-pin-confirm-mobile.js

@@ -30,10 +30,10 @@ const styles = StyleSheet.create({
   },
 });
 
-const ResetPinConfirmView = ({ store, nav, auth }) => (
+const ResetPinConfirmView = ({ store, auth }) => (
   <Background color={color.blackDark}>
     <Header separator>
-      <BackButton onPress={() => nav.goResetPasswordNew()} />
+      <BackButton onPress={() => auth.initResetPinNew()} />
       <Title title="Change PIN" />
       <Button disabled onPress={() => {}} />
     </Header>
@@ -56,7 +56,6 @@ const ResetPinConfirmView = ({ store, nav, auth }) => (
 ResetPinConfirmView.propTypes = {
   store: PropTypes.object.isRequired,
   auth: PropTypes.object.isRequired,
-  nav: PropTypes.object.isRequired,
 };
 
 export default observer(ResetPinConfirmView);

src/view/reset-pin-new-mobile.js

@@ -30,10 +30,10 @@ const styles = StyleSheet.create({
   },
 });
 
-const NewPinView = ({ store, nav, auth }) => (
+const ResetPinNewView = ({ store, auth }) => (
   <Background color={color.blackDark}>
     <Header separator>
-      <BackButton onPress={() => nav.goResetPasswordCurrent()} />
+      <BackButton onPress={() => auth.initResetPin()} />
       <Title title="Change PIN" />
       <Button disabled onPress={() => {}} />
     </Header>
@@ -53,10 +53,9 @@ const NewPinView = ({ store, nav, auth }) => (
   </Background>
 );
 
-NewPinView.propTypes = {
+ResetPinNewView.propTypes = {
   store: PropTypes.object.isRequired,
   auth: PropTypes.object.isRequired,
-  nav: PropTypes.object.isRequired,
 };
 
-export default observer(NewPinView);
+export default observer(ResetPinNewView);

stories/screen-story.js

@@ -176,10 +176,10 @@ storiesOf('Screens', module)
     <ResetPinCurrent store={store} auth={auth} nav={nav} />
   ))
   .add('Reset PIN - New (Mobile)', () => (
-    <ResetPinNew store={store} auth={auth} nav={nav} />
+    <ResetPinNew store={store} auth={auth} />
   ))
   .add('Reset PIN - Confirm New (Mobile)', () => (
-    <ResetPinConfirm store={store} auth={auth} nav={nav} />
+    <ResetPinConfirm store={store} auth={auth} />
   ))
   .add('Reset PIN - Saved (Mobile)', () => <ResetPinSaved nav={nav} />)
   .add('New Address', () => (

test/unit/action/auth-mobile.spec.js

@@ -64,6 +64,17 @@ describe('Action AuthMobile Unit Tests', () => {
     });
   });
 
+  describe('initResetPinNew()', () => {
+    it('should init values and navigate', () => {
+      store.auth.resetPinCurrent = '123456';
+      auth.initResetPinNew();
+      expect(store.auth.resetPinCurrent, 'to equal', '123456');
+      expect(store.auth.resetPinNew, 'to equal', '');
+      expect(store.auth.resetPinVerify, 'to equal', '');
+      expect(nav.goResetPasswordNew, 'was called once');
+    });
+  });
+
   describe('pushPinDigit()', () => {
     it('should add a digit for empty pin', () => {
       auth.pushPinDigit({ digit: '1', param: 'pin' });
@@ -104,6 +115,11 @@ describe('Action AuthMobile Unit Tests', () => {
   });
 
   describe('popPinDigit()', () => {
+    beforeEach(() => {
+      sandbox.stub(auth, 'initResetPinNew');
+      sandbox.stub(auth, 'initResetPin');
+    });
+
     it('should remove digit from a pin', () => {
       store.auth.pin = '000000';
       auth.popPinDigit({ param: 'pin' });
@@ -131,13 +147,13 @@ describe('Action AuthMobile Unit Tests', () => {
     it('should go from ResetPinConfirmed to ResetPinNew on empty string', () => {
       store.auth.resetPinVerify = '';
       auth.popPinDigit({ param: 'resetPinVerify' });
-      expect(nav.goResetPasswordNew, 'was called once');
+      expect(auth.initResetPinNew, 'was called once');
     });
 
     it('should go from ResetPinNew to ResetPinCurrent on empty string', () => {
       store.auth.resetPinNew = '';
       auth.popPinDigit({ param: 'resetPinNew' });
-      expect(nav.goResetPasswordCurrent, 'was called once');
+      expect(auth.initResetPin, 'was called once');
     });
   });