status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug/safe crash when accessing from link (#1209) 

* use updateSafeAction for adding modules

* Fix address parameter naming issue

Add comment to ADD_SAFE_MODULE behaviour

* fetchSafe batch everything to updateSafe

* remove addSafeModules action

Co-authored-by: Mikhail Mikheev <mmvsha73@gmail.com>
This commit is contained in:
Daniel Sanchez 2020-08-07 16:49:29 +02:00
parent b965b5c712
commit f8565f4662
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/routes/safe/store/actions/addSafeModules.ts
View File

@ -1,7 +0,0 @@
import { createAction } from 'redux-actions'
export const ADD_SAFE_MODULES = 'ADD_SAFE_MODULES'
const addSafeModules = createAction(ADD_SAFE_MODULES)
export default addSafeModules

4
src/routes/safe/store/actions/fetchSafe.ts
View File

@ -48,7 +48,7 @@ const buildModulesLinkedList = (modules: string[] | undefined, nextModule: strin
return null return null
} }
export const buildSafe = async (safeAdd, safeName, latestMasterContractVersion?: any) => { export const buildSafe = async (safeAdd: string, safeName: string, latestMasterContractVersion?: any) => {
const safeAddress = checksumAddress(safeAdd) const safeAddress = checksumAddress(safeAdd)
const safeParams = ['getThreshold', 'nonce', 'VERSION', 'getOwners'] const safeParams = ['getThreshold', 'nonce', 'VERSION', 'getOwners']
@ -140,7 +140,7 @@ export const checkAndUpdateSafe = (safeAdd: string) => async (dispatch: Dispatch
} }
// eslint-disable-next-line consistent-return // eslint-disable-next-line consistent-return
export default (safeAdd) => async (dispatch, getState) => { export default (safeAdd: string) => async (dispatch, getState) => {
try { try {
const safeAddress = checksumAddress(safeAdd) const safeAddress = checksumAddress(safeAdd)
const safeName = (await getSafeName(safeAddress)) || 'LOADED SAFE' const safeName = (await getSafeName(safeAddress)) || 'LOADED SAFE'

5
src/routes/safe/store/reducer/safe.ts
View File

@ -15,7 +15,6 @@ import { makeOwner } from 'src/routes/safe/store/models/owner'
import makeSafe from 'src/routes/safe/store/models/safe' import makeSafe from 'src/routes/safe/store/models/safe'
import { checksumAddress } from 'src/utils/checksumAddress' import { checksumAddress } from 'src/utils/checksumAddress'
import { SafeReducerMap } from './types/safe' import { SafeReducerMap } from './types/safe'
import { ADD_SAFE_MODULES } from 'src/routes/safe/store/actions/addSafeModules'
export const SAFE_REDUCER_ID = 'safes' export const SAFE_REDUCER_ID = 'safes'
export const DEFAULT_SAFE_INITIAL_STATE = 'NOT_ASKED' export const DEFAULT_SAFE_INITIAL_STATE = 'NOT_ASKED'
@ -128,10 +127,6 @@ export default handleActions(
return prevSafe.merge({ owners: updatedOwners }) return prevSafe.merge({ owners: updatedOwners })
}) })
}, },
[ADD_SAFE_MODULES]: (state: SafeReducerMap, action) => {
const { modulesAddresses, safeAddress } = action.payload
return state.setIn(['safes', safeAddress, 'modules'], modulesAddresses)
},
[SET_DEFAULT_SAFE]: (state: SafeReducerMap, action) => state.set('defaultSafe', action.payload), [SET_DEFAULT_SAFE]: (state: SafeReducerMap, action) => state.set('defaultSafe', action.payload),
[SET_LATEST_MASTER_CONTRACT_VERSION]: (state: SafeReducerMap, action) => [SET_LATEST_MASTER_CONTRACT_VERSION]: (state: SafeReducerMap, action) =>
state.set('latestMasterContractVersion', action.payload), state.set('latestMasterContractVersion', action.payload),