master merge

Dockerfile

@@ -0,0 +1,12 @@
+FROM node:14-slim as builder
+WORKDIR /app
+COPY . .
+RUN apt update && apt install git -y
+RUN yarn
+RUN yarn build-mainnet
+
+
+FROM nginx:stable-alpine-perl
+COPY --from=builder /app/build /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/
+EXPOSE 80

nginx.conf

@@ -0,0 +1,31 @@
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}

package.json

@@ -18,9 +18,9 @@
   "main": "public/electron.js",
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
-    "build-desktop": "cross-env REACT_APP_BUILD_FOR_DESKTOP=true REACT_APP_ENV=production yarn build-mainnet",
-    "build-mainnet": "cross-env REACT_APP_NETWORK=mainnet yarn build",
-    "build": "cross-env REACT_APP_APP_VERSION=$npm_package_version rescripts --max-old-space-size=8192 build",
+    "build-desktop": "cross-env GENERATE_SOURCEMAP=false REACT_APP_BUILD_FOR_DESKTOP=true REACT_APP_ENV=production yarn build-mainnet",
+    "build-mainnet": "cross-env GENERATE_SOURCEMAP=false REACT_APP_GOOGLE_ANALYTICS=UA-192269037-1 REACT_APP_NETWORK=mainnet yarn build",
+    "build": "cross-env GENERATE_SOURCEMAP=false REACT_APP_APP_VERSION=$npm_package_version rescripts --max-old-space-size=8192 build",
     "eject": "rescripts eject",
     "electron-build": "electron-builder --mac --windows --linux",
     "electron-dev": "concurrently \"BROWSER=none yarn start\" \"wait-on http://localhost:3000 && electron .\"",
@@ -94,7 +94,7 @@
         }
       ]
     },
-   "files": [
+    "files": [
       "build",
       "patches",
       "public",
@@ -193,6 +193,7 @@
     "express": "^4.17.1",
     "final-form": "^4.20.1",
     "final-form-calculate": "^1.3.2",
+    "flow-type": "^1.0.1",
     "history": "4.10.1",
     "immortal-db": "^1.1.0",
     "immutable": "^4.0.0-rc.12",
@@ -220,6 +221,7 @@
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
     "semver": "^7.3.2",
+    "source-map-explorer": "^2.5.2",
     "styled-components": "^5.2.1",
     "web3": "1.2.11",
     "web3-core": "^1.2.11",
@@ -248,6 +250,7 @@
     "@types/styled-components": "^5.1.4",
     "@typescript-eslint/eslint-plugin": "^4.6.0",
     "@typescript-eslint/parser": "^4.6.0",
+    "clean-webpack-plugin": "^3.0.0",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-expand": "^5.1.0",

scripts/rescripts/webpack.js

@@ -1,6 +1,10 @@
-const { removeWebpackPlugin } = require('@rescripts/utilities')
+const { removeWebpackPlugin, appendWebpackPlugin } = require('@rescripts/utilities')
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 
 module.exports = config => {
   const webpackWithoutEsLint = removeWebpackPlugin('ESLintWebpackPlugin', config)
-  return webpackWithoutEsLint
+  return appendWebpackPlugin(
+    new CleanWebpackPlugin(),
+    webpackWithoutEsLint,
+  )
 }

src/components/App/ReceiveModal.tsx

@@ -106,7 +106,7 @@ const ReceiveModal = ({ onClose, safeAddress, safeName }: Props): ReactElement =
       </Paragraph>
       <Paragraph className={classes.annotation} noMargin size="lg">
         This is the address of your Safe. Deposit funds by scanning the QR code or copying the address below. Only send{' '}
-        {networkInfo.nativeCoin.name} and ERC-20 tokens to this address!
+        {networkInfo.nativeCoin.name} and BEP-20 tokens to this address!
       </Paragraph>
       <Col layout="column" middle="xs">
         <Paragraph className={classes.safeName} noMargin size="lg" weight="bold">

src/components/AppLayout/Footer/index.tsx

@@ -1,11 +1,8 @@
 import { makeStyles } from '@material-ui/core/styles'
 import cn from 'classnames'
 import * as React from 'react'
-import { useDispatch } from 'react-redux'
 
-import GnoButtonLink from 'src/components/layout/ButtonLink'
 import Link from 'src/components/layout/Link'
-import { openCookieBanner } from 'src/logic/cookies/store/actions/openCookieBanner'
 import { screenSm, secondary, sm } from 'src/theme/variables'
 
 const useStyles = makeStyles({
@@ -42,52 +39,17 @@ const useStyles = makeStyles({
   },
 } as any)
 
-const appVersion = process.env.REACT_APP_APP_VERSION ? `v${process.env.REACT_APP_APP_VERSION} ` : 'Versions'
-
 const Footer = (): React.ReactElement => {
   const date = new Date()
   const classes = useStyles()
-  const dispatch = useDispatch()
-
-  const openCookiesHandler = () => {
-    dispatch(openCookieBanner(true))
-  }
 
   return (
     <footer className={classes.footer}>
-      <span className={classes.item}>©{date.getFullYear()} Gnosis</span>
+      <span className={classes.item}>©{date.getFullYear()} Hosted by Binance</span>
       <span className={classes.sep}>|</span>
-      <Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/terms">
+      <Link className={cn(classes.item, classes.link)} target="_blank" to="https://www.binance.org/en/terms">
         Terms
       </Link>
-      <span className={classes.sep}>|</span>
-      <Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/privacy">
-        Privacy
-      </Link>
-      <span className={classes.sep}>|</span>
-      <Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/licenses">
-        Licenses
-      </Link>
-      <span className={classes.sep}>|</span>
-      <Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/imprint">
-        Imprint
-      </Link>
-      <span className={classes.sep}>|</span>
-      <Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/cookie">
-        Cookie Policy
-      </Link>
-      <span className={classes.sep}>-</span>
-      <GnoButtonLink className={cn(classes.item, classes.link, classes.buttonLink)} onClick={openCookiesHandler}>
-        Preferences
-      </GnoButtonLink>
-      <span className={classes.sep}>|</span>
-      <Link
-        className={cn(classes.item, classes.link)}
-        target="_blank"
-        to="https://github.com/gnosis/safe-react/releases"
-      >
-        {appVersion}
-      </Link>
     </footer>
   )
 }

src/components/AppLayout/Header/components/Layout.tsx

@@ -15,7 +15,7 @@ import Row from 'src/components/layout/Row'
 import { border, headerHeight, md, screenSm, sm } from 'src/theme/variables'
 import { useStateHandler } from 'src/logic/hooks/useStateHandler'
 
-import SafeLogo from '../assets/gnosis-safe-multisig-logo.svg'
+import SafeLogo from '../assets/binance_dex.svg'
 
 const styles = () => ({
   root: {

src/components/AppLayout/index.tsx

@@ -97,7 +97,7 @@ const Layout: React.FC<Props> = ({
         <Header />
       </HeaderWrapper>
       <BodyWrapper>
-        <SidebarWrapper>
+        <SidebarWrapper data-testid="sidebar">
           <Sidebar
             items={sidebarItems}
             safeAddress={safeAddress}

src/components/CookiesBanner/index.tsx

@@ -13,7 +13,6 @@ import { cookieBannerOpen } from 'src/logic/cookies/store/selectors'
 import { loadFromCookie, saveCookie } from 'src/logic/cookies/utils'
 import { mainFontFamily, md, primary, screenSm } from 'src/theme/variables'
 import { loadGoogleAnalytics } from 'src/utils/googleAnalytics'
-import { loadIntercom } from 'src/utils/intercom'
 
 const isDesktop = process.env.REACT_APP_BUILD_FOR_DESKTOP
 
@@ -195,10 +194,8 @@ const CookiesBanner = () => {
   )
 
   if (showAnalytics) {
-    loadIntercom()
     loadGoogleAnalytics()
   }
-  if (isDesktop) loadIntercom()
 
   return showBanner && !isDesktop ? cookieBannerContent : null
 }

src/config/networks/mainnet.ts

@@ -1,17 +1,17 @@
-import EtherLogo from 'src/config/assets/token_eth.svg'
+import BnbLogo from 'src/config/assets/token_bnb.svg'
 import { EnvironmentSettings, ETHEREUM_NETWORK, NetworkConfig } from 'src/config/networks/network.d'
 
 const baseConfig: EnvironmentSettings = {
-  txServiceUrl: 'https://safe-transaction.mainnet.staging.gnosisdev.com/api/v1',
+  txServiceUrl: 'https://gnosis-safe-transaction.binance.org/api/v1',
   safeAppsUrl: 'https://safe-apps.dev.gnosisdev.com',
   gasPriceOracle: {
     url: 'https://ethgasstation.info/json/ethgasAPI.json',
     gasParameter: 'average',
   },
-  rpcServiceUrl: 'https://mainnet.infura.io:443/v3',
-  networkExplorerName: 'Etherscan',
-  networkExplorerUrl: 'https://etherscan.io',
-  networkExplorerApiUrl: 'https://api.etherscan.io/api',
+  rpcServiceUrl: 'https://bsc-dataseed.binance.org',
+  networkExplorerName: 'BscScan',
+  networkExplorerUrl: 'https://bscscan.com',
+  networkExplorerApiUrl: 'https://api.bscscan.com/api',
 }
 
 const mainnet: NetworkConfig = {
@@ -25,7 +25,7 @@ const mainnet: NetworkConfig = {
     },
     production: {
       ...baseConfig,
-      txServiceUrl: 'https://safe-transaction.mainnet.gnosis.io/api/v1',
+      txServiceUrl: 'https://gnosis-safe-transaction.binance.org/api/v1',
       safeAppsUrl: 'https://apps.gnosis-safe.io',
     },
   },
@@ -37,10 +37,10 @@ const mainnet: NetworkConfig = {
     isTestNet: false,
     nativeCoin: {
       address: '0x000',
-      name: 'Ether',
-      symbol: 'ETH',
+      name: 'BNB',
+      symbol: 'BNB',
       decimals: 18,
-      logoUri: EtherLogo,
+      logoUri: BnbLogo,
     },
   },
 }

src/config/networks/network.d.ts

@@ -36,7 +36,7 @@ type Token = {
 }
 
 export enum ETHEREUM_NETWORK {
-  MAINNET = 1,
+  MAINNET = 56,
   MORDEN = 2,
   ROPSTEN = 3,
   RINKEBY = 4,

src/logic/contracts/safeContracts.ts

@@ -16,7 +16,7 @@ import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 import SpendingLimitModule from './artifacts/AllowanceModule.json'
 
 export const SENTINEL_ADDRESS = '0x0000000000000000000000000000000000000001'
-export const MULTI_SEND_ADDRESS = '0x8d29be29923b68abfdd21e541b9374737b49cdad'
+export const MULTI_SEND_ADDRESS = '0x663a65a0523103846a1761ab90a1a4731156c453'
 export const SAFE_MASTER_COPY_ADDRESS = '0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F'
 export const DEFAULT_FALLBACK_HANDLER_ADDRESS = '0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44'
 export const SAFE_MASTER_COPY_ADDRESS_V10 = '0xb6029EA3B2c51D09a50B53CA8012FeEB05bDa35A'
@@ -34,7 +34,7 @@ export const getGnosisSafeContract = (web3: Web3, networkId: ETHEREUM_NETWORK) =
   // TODO: this may not be the most scalable approach,
   //  but up until v1.2.0 the address is the same for all the networks.
   //  So, if we can't find the network in the Contract artifact, we fallback to MAINNET.
-  const contractAddress = networks[networkId]?.address ?? networks[ETHEREUM_NETWORK.MAINNET].address
+  const contractAddress = '0x2bb001433cf04c1f7d71e3c40fed66b2b563065e'
   return (new web3.eth.Contract(GnosisSafeSol.abi as AbiItem[], contractAddress) as unknown) as GnosisSafe
 }
 
@@ -48,7 +48,7 @@ const getProxyFactoryContract = (web3: Web3, networkId: ETHEREUM_NETWORK): Gnosi
   // TODO: this may not be the most scalable approach,
   //  but up until v1.2.0 the address is the same for all the networks.
   //  So, if we can't find the network in the Contract artifact, we fallback to MAINNET.
-  const contractAddress = networks[networkId]?.address ?? networks[ETHEREUM_NETWORK.MAINNET].address
+  const contractAddress = '0x7a32d4df6d7aff9b3b975452518b4be38d8f6d6f'
   return (new web3.eth.Contract(ProxyFactorySol.abi as AbiItem[], contractAddress) as unknown) as GnosisSafeProxyFactory
 }