fix: CAN REBASE AMEND, Infer status from state

Author: kyranjamie

components/maker/status/index.js

@@ -70,8 +70,8 @@ const Status = ({ app, status }) => {
 
         {isReady ? <AppMiningComplete /> : <AppMiningIncomplete/>}
 
-        <ItemToCompleteField label="Payment details" status={status.paymentDetailsComplete || hasPaymentDetails(app)} />
-        <ItemToCompleteField label="Identity Verification" status={status.kycComplete || app.hasCollectedKYC} />
+        <ItemToCompleteField label="Payment details" status={hasPaymentDetails(app)} />
+        <ItemToCompleteField label="Identity Verification" status={app.hasCollectedKYC} />
         <ItemToCompleteField label="Tax Documents" status={app.isKYCVerified} />
         <ItemToCompleteField label="SEC Participation Agreement" status={app.hasAcceptedSECTerms} />
       </Box>

stores/maker/actions.js

@@ -17,9 +17,11 @@ export const SELECT_APP = '[Maker Page] SELECT_APP'
 
 export const errorAction = () => ({ type: MAKER_AUTH_ERROR })
 export const setLoadingDoneAction = () => ({ type: SET_LOADING_DONE })
-export const setPaymentDetailsComplete = () => ({ type: SET_PAYMENT_DETAILS_COMPLETE })
 export const savePaymentDetailsAction = () => ({ type: SAVE_PAYMENT_DETAILS })
-export const savePaymentDetailsDoneAction = () => ({ type: SAVE_PAYMENT_DETAILS_DONE })
+export const savePaymentDetailsDoneAction = addresses => ({
+  type: SAVE_PAYMENT_DETAILS_DONE,
+  payload: addresses
+})
 export const savePaymentDetailsFailAction = () => ({ type: SAVE_PAYMENT_DETAILS_FAIL })
 
 export const setKycComplete = () => ({ type: SET_KYC_COMPLETE })
@@ -46,14 +48,12 @@ export const savePaymentDetails = ({ apiServer, appId, jwt, btcAddress, stxAddre
       })
     })
     await response.json()
-    dispatch(setPaymentDetailsComplete())
-    dispatch(savePaymentDetailsDoneAction())
+    dispatch(savePaymentDetailsDoneAction({ appId, btcAddress, stxAddress }))
   } catch (error) {
     dispatch(savePaymentDetailsFailAction(error))
   }
 }
 
-
 export const fetchApps = ({ user, apiServer }) => async dispatch => {
   dispatch(fetchAppsAction())
   if (!(user && user.jwt)) {
@@ -74,4 +74,3 @@ export const fetchApps = ({ user, apiServer }) => async dispatch => {
     dispatch(fetchAppsFailAction())
   }
 }
-

stores/maker/reducer.js

@@ -7,21 +7,12 @@ const initialState = {
   appIds: [],
   appEntities: {},
   selectedAppId: null,
-  errorMessage: null,
-  status: {
-    paymentDetailsComplete: false,
-    kycComplete: false,
-    legalComplete: false
-  }
+  errorMessage: null
 }
 
-const updateStatus = (state, props) => ({
-  ...state,
-  status: { ...state.status, ...props }
-})
-
 function makerReducer(state = initialState, action) {
   switch (action.type) {
+
     case MakerActions.SET_LOADING_DONE:
       return {
         ...state,
@@ -43,15 +34,6 @@ function makerReducer(state = initialState, action) {
         selectedAppId: action.payload.apps.length ? action.payload.apps[0].id : null
       }
 
-    case MakerActions.SET_PAYMENT_DETAILS_COMPLETE:
-      return updateStatus(state, { paymentDetailsComplete: true })
-
-    case MakerActions.SET_KYC_COMPLETE:
-      return updateStatus(state, { kycComplete: true })
-
-    case MakerActions.SET_LEGAL_COMPLETE:
-      return updateStatus(state, { legalComplete: true })
-
     case MakerActions.SELECT_APP:
       return { ...state, selectedAppId: action.payload }
 
@@ -60,8 +42,8 @@ function makerReducer(state = initialState, action) {
         ...state,
         appEntities: {
           ...state.appEntities,
-          [action.payload.id]: {
-            ...state.appEntities[action.payload.id],
+          [action.payload.appId]: {
+            ...state.appEntities[action.payload.appId],
             BTCAddress: action.payload.btcAddress,
             stacksAddress: action.payload.stxAddress
           }