Merge branch 'development' into fix/#950-parameter-validation-contractInteraction

# Conflicts:
#	yarn.lock

package.json

@@ -53,6 +53,7 @@
   "build": {
     "appId": "io.gnosis.safe.macos",
     "afterSign": "scripts/notarize.js",
+    "extends": null,
     "productName": "Safe Multisig",
     "asar": true,
     "publish": [
@@ -85,7 +86,6 @@
       "!migrations${/*}",
       "!flow-typed${/*}",
       "!apps${/*}",
-      "!build${/*}",
       "!out${/*}",
       "!.editorconfig",
       "!.gitignore",
@@ -159,8 +159,9 @@
     "async-sema": "^3.1.0",
     "axios": "0.19.2",
     "bignumber.js": "9.0.0",
-    "bnc-onboard": "1.9.0",
+    "bnc-onboard": "1.9.1",
     "classnames": "^2.2.6",
+    "concurrently": "^5.2.0",
     "connected-react-router": "6.8.0",
     "currency-flags": "2.1.2",
     "date-fns": "2.13.0",

public/electron.js

@@ -1,14 +1,12 @@
 const electron = require("electron");
-const  express = require('express');
+const express = require('express');
 const open = require('open');
 const log = require('electron-log');
 const fs = require('fs');
-const dialog = electron.dialog;
 const Menu = electron.Menu;
 const https = require('https');
 const autoUpdater = require('./auto-updater');
 
-const url = require('url');
 const app = electron.app;
 const session = electron.session;
 const BrowserWindow = electron.BrowserWindow;
@@ -164,4 +162,4 @@ app.on("activate", () => {
   if (mainWindow === null) {
     createWindow();
   }
-});
+});

scripts/notarize.js

@@ -0,0 +1,41 @@
+const fs = require("fs");
+const path = require("path");
+const { notarize } = require("electron-notarize");
+const envConfig = require('dotenv').config({path:path.join(__dirname, '../.env')});
+
+Object.entries(envConfig.parsed || {}).forEach(([key, value]) => {
+  process.env[key] = value;
+});
+
+
+module.exports = async function (params) {
+
+    // Only notarize the app on Mac OS only.
+  if (process.platform !== "darwin") {
+    return;
+  }
+  // Same appId in electron-builder.
+  let appId = "io.gnosis.safe.macos";
+  let appPath = path.join(
+    params.appOutDir,
+    `${params.packager.appInfo.productFilename}.app`
+  );
+  if (!fs.existsSync(appPath)) {
+    throw new Error(`Cannot find application at: ${appPath}`);
+  }
+
+  console.log(`Notarizing ${appId} found at ${appPath}`);
+
+  try {
+    await notarize({
+      appBundleId: appId,
+      appPath: appPath,
+      appleId: process.env.APPLEID,
+      appleIdPassword: process.env.APPLEIDPASS,
+    });
+  } catch (error) {
+    console.error(error);
+  }
+
+  console.log(`Done notarizing ${appId}`);
+};

src/components/ConnectButton/index.tsx

@@ -50,9 +50,9 @@ export const onboard = Onboard({
   walletCheck: [
     { checkName: 'derivationPath' },
     { checkName: 'connect' },
-    transactionDataCheck(),
-    { checkName: 'network' },
     { checkName: 'accounts' },
+    { checkName: 'network' },
+    transactionDataCheck(),
   ],
 })
 

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

@@ -111,47 +111,51 @@ const Balances = (props) => {
           >
             Coins
           </NavLink>
-          <Divider className={assetDivider} />
+          {erc721Enabled ? (
-          <NavLink
+            <>
-            to={`${SAFELIST_ADDRESS}/${address}/balances/collectibles`}
+              <Divider className={assetDivider} />
-            activeClassName={assetTabActive}
+              <NavLink
-            className={assetTab}
+                to={`${SAFELIST_ADDRESS}/${address}/balances/collectibles`}
-            data-testid={'collectibles-assets-btn'}
+                activeClassName={assetTabActive}
-            exact
+                className={assetTab}
-          >
+                data-testid={'collectibles-assets-btn'}
-            Collectibles
+                exact
-          </NavLink>
+              >
+                Collectibles
+              </NavLink>
+            </>
+          ) : null}
         </Col>
         <Switch>
           <Route
             path={`${SAFELIST_ADDRESS}/${address}/balances/collectibles`}
             exact
             render={() => {
-              return (
+              return !erc721Enabled ? (
-                <>
+                <Redirect to={`${SAFELIST_ADDRESS}/${address}/balances`} />
-                  <Col className={tokenControls} end="sm" sm={6} xs={12}>
+              ) : (
-                    <ButtonLink
+                <Col className={tokenControls} end="sm" sm={6} xs={12}>
-                      className={manageTokensButton}
+                  <ButtonLink
-                      onClick={() => onShow('ManageCollectibleModal')}
+                    className={manageTokensButton}
-                      size="lg"
+                    onClick={() => onShow('ManageCollectibleModal')}
-                      testId="manage-tokens-btn"
+                    size="lg"
-                    >
+                    testId="manage-tokens-btn"
-                      Manage List
+                  >
-                    </ButtonLink>
+                    Manage List
-                    <Modal
+                  </ButtonLink>
-                      description={'Enable and disable tokens to be listed'}
+                  <Modal
-                      handleClose={() => onHide('ManageCollectibleModal')}
+                    description={'Enable and disable tokens to be listed'}
-                      open={showManageCollectibleModal}
+                    handleClose={() => onHide('ManageCollectibleModal')}
-                      title="Manage List"
+                    open={showManageCollectibleModal}
-                    >
+                    title="Manage List"
-                      <Tokens
+                  >
-                        modalScreen={'assetsList'}
+                    <Tokens
-                        onClose={() => onHide('ManageCollectibleModal')}
+                      modalScreen={'assetsList'}
-                        safeAddress={address}
+                      onClose={() => onHide('ManageCollectibleModal')}
-                      />
+                      safeAddress={address}
-                    </Modal>
+                    />
-                  </Col>
+                  </Modal>
-                </>
+                </Col>
               )
             }}
           />
@@ -199,12 +203,10 @@ const Balances = (props) => {
         />
         <Route
           path={`${SAFELIST_ADDRESS}/${address}/balances`}
-          exact
           render={() => {
             return wrapInSuspense(<Coins showReceiveFunds={() => onShow('Receive')} showSendFunds={showSendFunds} />)
           }}
         />
-        <Redirect to={`${SAFELIST_ADDRESS}/${address}/balances`} />
       </Switch>
       <SendModal
         activeScreenType="sendFunds"