Remove unsafe update in sentVerificationEmail reducer (#19364)

keybase · Sep 12, 2019 · 4931602 · 4931602
1 parent dd401f2
commit 4931602
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/shared/reducers/settings.tsx b/shared/reducers/settings.tsx
@@ -234,19 +234,18 @@ function reducer(state: Types.State = initialState, action: Actions): Types.Stat
       )
     }
     case SettingsGen.sentVerificationEmail: {
-      return state
-        .update('email', emailState =>
-          emailState.merge({
-            addedEmail: action.payload.email,
-          })
-        )
-        .updateIn(['email', 'emails'], emails => {
-          return emails.update(action.payload.email, email =>
-            email.merge({
-              lastVerifyEmailDate: new Date().getTime() / 1000,
-            })
-          )
+      return state.update('email', emailState =>
+        emailState.merge({
+          addedEmail: action.payload.email,
+          emails: (emailState.emails || I.Map<string, Types.EmailRow>()).update(
+            action.payload.email,
+            (email = Constants.makeEmailRow({email: action.payload.email, isVerified: false})) =>
+              email.merge({
+                lastVerifyEmailDate: new Date().getTime() / 1000,
+              })
+          ),
         })
+      )
     }
     case SettingsGen.clearAddingEmail: {
       return state.update('email', emailState => emailState.merge({addingEmail: null, error: ''}))