Merge branch 'development' into feature/cla-assistant

src/logic/contracts/safeContracts.ts

@@ -11,7 +11,7 @@ import { isProxyCode } from 'src/logic/contracts/historicProxyCode'
 import Web3 from 'web3'
 
 export const SENTINEL_ADDRESS = '0x0000000000000000000000000000000000000001'
-export const MULTI_SEND_ADDRESS = '0xB522a9f781924eD250A11C54105E51840B138AdD'
+export const MULTI_SEND_ADDRESS = '0x8d29be29923b68abfdd21e541b9374737b49cdad'
 export const SAFE_MASTER_COPY_ADDRESS = '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F'
 export const DEFAULT_FALLBACK_HANDLER_ADDRESS = '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
 export const SAFE_MASTER_COPY_ADDRESS_V10 = '0xb6029EA3B2c51D09a50B53CA8012FeEB05bDa35A'

src/routes/safe/components/Apps/index.tsx

@@ -39,6 +39,14 @@ const Centered = styled.div`
   flex-direction: column;
 `
 
+const LoadingContainer = styled.div`
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`
+
 const CenteredMT = styled(Centered)`
   margin-top: 5px;
 `
@@ -48,15 +56,6 @@ const IframeWrapper = styled.div`
   height: 100%;
   width: 100%;
 `
-
-const IframeCoverLoading = styled.div`
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background: white;
-`
 const operations = {
   ON_SAFE_INFO: 'ON_SAFE_INFO',
   SAFE_APP_SDK_INITIALIZED: 'SAFE_APP_SDK_INITIALIZED',
@@ -155,9 +154,9 @@ function Apps({ closeModal, closeSnackbar, enqueueSnackbar, openModal }) {
     return (
       <IframeWrapper>
         {appIsLoading && (
-          <IframeCoverLoading>
+          <LoadingContainer>
             <Loader size="md" />
-          </IframeCoverLoading>
+          </LoadingContainer>
         )}
         <StyledIframe frameBorder="0" id={`iframe-${app.name}`} ref={iframeRef} src={app.url} title={app.name} />
       </IframeWrapper>
@@ -384,12 +383,12 @@ function Apps({ closeModal, closeSnackbar, enqueueSnackbar, openModal }) {
     }
   }, [ethBalance, getSelectedApp, iframeEl, network, safeAddress, selectedApp, sendMessageToIframe])
 
-  if (loading) {
-    return <Loader size="md" />
-  }
-
   if (loading || !appList.length) {
-    return <Loader size="md" />
+    return (
+      <LoadingContainer>
+        <Loader size="md" />
+      </LoadingContainer>
+    )
   }
 
   return (

src/routes/safe/components/Apps/sendTransactions.ts

@@ -1,8 +1,8 @@
 import { DELEGATE_CALL } from 'src/logic/safe/transactions/send'
 import { getWeb3 } from 'src/logic/wallets/getWeb3'
 import createTransaction from 'src/routes/safe/store/actions/createTransaction'
+import { MULTI_SEND_ADDRESS } from 'src/logic/contracts/safeContracts'
 
-const multiSendAddress = '0xB522a9f781924eD250A11C54105E51840B138AdD'
 const multiSendAbi = [
   {
     type: 'function',
@@ -17,7 +17,7 @@ const multiSendAbi = [
 
 const sendTransactions = (dispatch, safeAddress, txs, enqueueSnackbar, closeSnackbar, origin) => {
   const web3 = getWeb3()
-  const multiSend: any = new web3.eth.Contract(multiSendAbi as any, multiSendAddress)
+  const multiSend: any = new web3.eth.Contract(multiSendAbi as any, MULTI_SEND_ADDRESS)
 
   const joinedTxs = txs
     .map((tx) =>
@@ -36,7 +36,7 @@ const sendTransactions = (dispatch, safeAddress, txs, enqueueSnackbar, closeSnac
   return dispatch(
     createTransaction({
       safeAddress,
-      to: multiSendAddress,
+      to: MULTI_SEND_ADDRESS,
       valueInWei: '0',
       txData: encodeMultiSendCallData,
       notifiedTransaction: 'STANDARD_TX',