Merge branch 'development' into issue-1144

.github/workflows/release.yml

@@ -44,8 +44,20 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 10.16
-      - run: yarn install --network-concurrency 1
-
+      - run: |
+          mkdir .yarncache
+          yarn install --frozen-lockfile --cache-folder ./.yarncache
+      - name: Remove and cache clean (Windows Only)
+        if: startsWith(matrix.os, 'windows')
+        shell: powershell
+        run: |
+          rm -Recurse -Force .yarncache
+          yarn cache clean
+      - name: Remove and cache clean
+        if: "!startsWith(matrix.os, 'windows')"
+        run: |
+          rm -rf .yarncache
+          yarn cache clean
       - name: Build/Release Desktop App
         env:
           # macOS notarization API key

src/routes/safe/store/actions/addSafeModules.ts

@@ -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

src/routes/safe/store/actions/fetchSafe.ts

@@ -15,7 +15,6 @@ import { makeOwner } from 'src/routes/safe/store/models/owner'
 import { checksumAddress } from 'src/utils/checksumAddress'
 import { ModulePair, SafeOwner } from 'src/routes/safe/store/models/safe'
 import { Dispatch } from 'redux'
-import addSafeModules from './addSafeModules'
 import { SENTINEL_ADDRESS } from 'src/logic/contracts/safeContracts'
 
 const buildOwnersFrom = (
@@ -49,7 +48,7 @@ const buildModulesLinkedList = (modules: string[] | undefined, nextModule: strin
   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 safeParams = ['getThreshold', 'nonce', 'VERSION', 'getOwners']
@@ -105,24 +104,16 @@ export const checkAndUpdateSafe = (safeAdd: string) => async (dispatch: Dispatch
 
   // Converts from [ { address, ownerName} ] to address array
   const localOwners = localSafe ? localSafe.owners.map((localOwner) => localOwner.address) : undefined
-  const localThreshold = localSafe ? localSafe.threshold : undefined
-  const localNonce = localSafe ? localSafe.nonce : undefined
 
   dispatch(
-    addSafeModules({
-      safeAddress,
-      modulesAddresses: buildModulesLinkedList(modules?.array, modules?.next),
+    updateSafe({
+      address: safeAddress,
+      modules: buildModulesLinkedList(modules?.array, modules?.next),
+      nonce: Number(remoteNonce),
+      threshold: Number(remoteThreshold),
     }),
   )
 
-  if (localNonce !== Number(remoteNonce)) {
-    dispatch(updateSafe({ address: safeAddress, nonce: Number(remoteNonce) }))
-  }
-
-  if (localThreshold !== Number(remoteThreshold)) {
-    dispatch(updateSafe({ address: safeAddress, threshold: Number(remoteThreshold) }))
-  }
-
   // If the remote owners does not contain a local address, we remove that local owner
   if (localOwners) {
     localOwners.forEach((localAddress) => {
@@ -149,7 +140,7 @@ export const checkAndUpdateSafe = (safeAdd: string) => async (dispatch: Dispatch
 }
 
 // eslint-disable-next-line consistent-return
-export default (safeAdd) => async (dispatch, getState) => {
+export default (safeAdd: string) => async (dispatch, getState) => {
   try {
     const safeAddress = checksumAddress(safeAdd)
     const safeName = (await getSafeName(safeAddress)) || 'LOADED SAFE'

src/routes/safe/store/reducer/safe.ts

@@ -15,7 +15,6 @@ import { makeOwner } from 'src/routes/safe/store/models/owner'
 import makeSafe from 'src/routes/safe/store/models/safe'
 import { checksumAddress } from 'src/utils/checksumAddress'
 import { SafeReducerMap } from './types/safe'
-import { ADD_SAFE_MODULES } from 'src/routes/safe/store/actions/addSafeModules'
 
 export const SAFE_REDUCER_ID = 'safes'
 export const DEFAULT_SAFE_INITIAL_STATE = 'NOT_ASKED'
@@ -128,10 +127,6 @@ export default handleActions(
         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_LATEST_MASTER_CONTRACT_VERSION]: (state: SafeReducerMap, action) =>
       state.set('latestMasterContractVersion', action.payload),