recover pass immer

shared/constants/recover-password.tsx

@@ -1,11 +1,10 @@
-import * as I from 'immutable'
 import * as Types from './types/recover-password'
 import HiddenString from '../util/hidden-string'
 
 export const waitingKey = 'recover-password:waiting'
 
-export const makeState = I.Record<Types._State>({
-  devices: I.List(),
+export const makeState = (): Types.State => ({
+  devices: [],
   error: new HiddenString(''),
   explainedDevice: undefined,
   paperKeyError: new HiddenString(''),

shared/constants/types/recover-password.tsx

@@ -1,10 +1,9 @@
-import * as I from 'immutable'
 import * as ProvisionTypes from './provision'
 import * as RPCTypes from './rpc-gen'
 import HiddenString from '../../util/hidden-string'
 
-export type _State = {
-  devices: I.List<ProvisionTypes.Device>
+export type State = Readonly<{
+  devices: Array<ProvisionTypes.Device>
   error: HiddenString
   explainedDevice?: {
     name: string
@@ -14,6 +13,4 @@ export type _State = {
   passwordError: HiddenString
   resetEmailSent?: boolean
   username: string
-}
-
-export type State = I.RecordOf<_State>
+}>

shared/login/recover-password/device-selector/container.tsx

@@ -6,7 +6,7 @@ type OwnProps = {}
 
 const ConnectedDeviceSelector = Container.connect(
   state => ({
-    devices: state.recoverPassword.devices.toArray(),
+    devices: state.recoverPassword.devices,
   }),
   dispatch => ({
     _onSelect: (id: string) => dispatch(RecoverPasswordGen.createSubmitDeviceSelect({id})),

shared/provision/select-other-device/index.tsx

@@ -25,7 +25,7 @@ class SelectOtherDevice extends React.Component<Props> {
   _renderItem = (index, item: DeviceOrReset) => {
     if (item === resetSignal) {
       return (
-        <Kb.Box2 direction="vertical" fullWidth={true}>
+        <Kb.Box2 direction="vertical" fullWidth={true} key="reset">
           <Kb.Text type="BodySmall" style={styles.or}>
             or
           </Kb.Text>

shared/reducers/recover-password.tsx

@@ -1,57 +1,47 @@
-import * as I from 'immutable'
 import * as Constants from '../constants/recover-password'
 import * as Types from '../constants/types/recover-password'
 import * as RecoverPasswordGen from '../actions/recover-password-gen'
-import HiddenString from '../util/hidden-string'
+import * as Container from '../util/container'
 
-const emptyHiddenString = new HiddenString('')
+const emptyHiddenString = new Container.HiddenString('')
 const initialState = Constants.makeState()
 
 type Actions = RecoverPasswordGen.Actions
 
-export default function(state: Types.State = initialState, action: Actions): Types.State {
-  switch (action.type) {
-    case RecoverPasswordGen.startRecoverPassword:
-      return state.merge({
-        paperKeyError: new HiddenString(''),
-        username: action.payload.username,
-      })
-    case RecoverPasswordGen.displayDeviceSelect:
-      return state.merge({
-        devices: I.List(action.payload.devices),
-      })
-    case RecoverPasswordGen.showExplainDevice:
-      return state.merge({
-        explainedDevice: {
-          name: action.payload.name,
-          type: action.payload.type,
-        },
-      })
-    case RecoverPasswordGen.submitPaperKey:
-      return state.merge({paperKeyError: emptyHiddenString})
-    case RecoverPasswordGen.setPaperKeyError:
-      return state.merge({
-        paperKeyError: action.payload.error,
-      })
-    case RecoverPasswordGen.submitPassword:
-      return state.merge({passwordError: emptyHiddenString})
-    case RecoverPasswordGen.setPasswordError:
-      return state.merge({
-        passwordError: action.payload.error,
-      })
-    case RecoverPasswordGen.displayError:
-      return state.merge({
-        error: action.payload.error,
-      })
-    case RecoverPasswordGen.completeResetPassword:
-      return state.merge({
-        resetEmailSent: true,
-      })
-    case RecoverPasswordGen.resetResetPasswordState:
-      return state.merge({
-        resetEmailSent: false,
-      })
-    default:
-      return state
-  }
-}
+export default Container.makeReducer<Actions, Types.State>(initialState, {
+  [RecoverPasswordGen.resetStore]: () => initialState,
+  [RecoverPasswordGen.startRecoverPassword]: (draftState, action) => {
+    draftState.paperKeyError = emptyHiddenString
+    draftState.username = action.payload.username
+  },
+  [RecoverPasswordGen.displayDeviceSelect]: (draftState, action) => {
+    draftState.devices = action.payload.devices
+  },
+  [RecoverPasswordGen.showExplainDevice]: (draftState, action) => {
+    draftState.explainedDevice = {
+      name: action.payload.name,
+      type: action.payload.type,
+    }
+  },
+  [RecoverPasswordGen.submitPaperKey]: draftState => {
+    draftState.paperKeyError = emptyHiddenString
+  },
+  [RecoverPasswordGen.setPaperKeyError]: (draftState, action) => {
+    draftState.paperKeyError = action.payload.error
+  },
+  [RecoverPasswordGen.submitPassword]: draftState => {
+    draftState.passwordError = emptyHiddenString
+  },
+  [RecoverPasswordGen.setPasswordError]: (draftState, action) => {
+    draftState.passwordError = action.payload.error
+  },
+  [RecoverPasswordGen.displayError]: (draftState, action) => {
+    draftState.error = action.payload.error
+  },
+  [RecoverPasswordGen.completeResetPassword]: draftState => {
+    draftState.resetEmailSent = true
+  },
+  [RecoverPasswordGen.resetResetPasswordState]: draftState => {
+    draftState.resetEmailSent = false
+  },
+})