From 0a38e3c4eacad6b0fb9b4f07a541b3083ef79c09 Mon Sep 17 00:00:00 2001
From: Mati Dastugue <matias.dastugue@altoros.com>
Date: Mon, 4 May 2020 12:12:38 -0300
Subject: [PATCH 1/2] Remove cookie banner for the desktop app

---
 config/webpack.config.prod.js          |  2 +-
 package.json                           |  8 ++++----
 src/components/CookiesBanner/index.jsx | 13 ++++++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 9d3f67c5..cae3bcff 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -52,7 +52,7 @@ function ensureSlash(path, needsSlash) {
 // single-page apps that may serve index.html for nested URLs like /todos/42.
 // We can't use a relative path in HTML because we don't want to load something
 // like /todos/42/static/js/bundle.7289d.js. We have to know the root.
-const buildDesktop = process.env.BUILD_FOR_DESKTOP
+const buildDesktop = process.env.REACT_APP_BUILD_FOR_DESKTOP
 
 const homepagePath = require(paths.appPackageJson).homepage
 //  var homepagePathname = homepagePath ? url.parse(homepagePath).pathname : '/';
diff --git a/package.json b/package.json
index 7b34c5c1..c02e1b9d 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "electron-dev": "concurrently \"BROWSER=none yarn start\" \"wait-on http://localhost:3000 && electron .\"",
     "preelectron-pack": "yarn build",
     "build-mainnet": "cross-env REACT_APP_NETWORK=mainnet yarn build",
-    "build-desktop": "cross-env BUILD_FOR_DESKTOP=true yarn build-mainnet",
+    "build-desktop": "cross-env REACT_APP_BUILD_FOR_DESKTOP=true yarn build-mainnet",
     "flow": "flow",
     "format:staged": "lint-staged",
     "lint:check": "eslint './src/**/*.{js,jsx}'",
@@ -136,9 +136,9 @@
   },
   "dependencies": {
     "@gnosis.pm/safe-contracts": "1.1.1-dev.2",
-    "@gnosis.pm/util-contracts": "2.0.6",    
-    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#a057248",   
-    "@ledgerhq/hw-transport-node-hid": "5.12.0",    
+    "@gnosis.pm/util-contracts": "2.0.6",
+    "@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#a057248",
+    "@ledgerhq/hw-transport-node-hid": "5.12.0",
     "@material-ui/core": "4.9.10",
     "@material-ui/icons": "4.9.1",
     "@material-ui/lab": "4.0.0-alpha.39",
diff --git a/src/components/CookiesBanner/index.jsx b/src/components/CookiesBanner/index.jsx
index b8dcd88e..6b1edba3 100644
--- a/src/components/CookiesBanner/index.jsx
+++ b/src/components/CookiesBanner/index.jsx
@@ -17,6 +17,8 @@ import { mainFontFamily, md, primary, screenSm } from '~/theme/variables'
 import { loadGoogleAnalytics } from '~/utils/googleAnalytics'
 import { loadIntercom } from '~/utils/intercom'
 
+const isDesktop = process.env.REACT_APP_BUILD_FOR_DESKTOP
+
 const useStyles = makeStyles({
   container: {
     backgroundColor: '#fff',
@@ -111,14 +113,18 @@ const CookiesBanner = () => {
     fetchCookiesFromStorage()
   }, [showBanner])
 
+  useEffect(() => {
+    if (isDesktop && showBanner) acceptCookiesHandler()
+  }, [isDesktop, showBanner])
+
   const acceptCookiesHandler = async () => {
     const newState = {
       acceptedNecessary: true,
-      acceptedAnalytics: true,
+      acceptedAnalytics: !isDesktop,
     }
     await saveCookie(COOKIES_KEY, newState, 365)
     dispatch(openCookieBanner(false))
-    setShowAnalytics(true)
+    setShowAnalytics(!isDesktop)
   }
 
   const closeCookiesBannerHandler = async () => {
@@ -193,8 +199,9 @@ const CookiesBanner = () => {
     loadIntercom()
     loadGoogleAnalytics()
   }
+  if (isDesktop) loadIntercom()
 
-  return showBanner ? cookieBannerContent : null
+  return showBanner && !isDesktop ? cookieBannerContent : null
 }
 
 export default CookiesBanner

From ccadda441beffb50e2f69ae3fef771cfab3e331e Mon Sep 17 00:00:00 2001
From: Mati Dastugue <matias.dastugue@altoros.com>
Date: Tue, 5 May 2020 14:56:39 -0300
Subject: [PATCH 2/2] Add INTERCOM_ID variable

---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8442f310..6e0566de 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ env:
   REACT_APP_INFURA_TOKEN: ${{ secrets.REACT_APP_INFURA_TOKEN }}
   REACT_APP_PORTIS_ID: ${{ secrets.REACT_APP_PORTIS_ID }}
   REACT_APP_GNOSIS_APPS_URL: ${{ secrets.REACT_APP_GNOSIS_APPS_URL }}
-
+  REACT_APP_INTERCOM_ID: ${{ secrets.REACT_APP_INTERCOM_ID }}
 jobs:
   release:
     runs-on: ${{ matrix.os }}
@@ -28,13 +28,13 @@ jobs:
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
-        
+
       - name: Patch node gyp on windows to support Visual Studio 2019
         if: startsWith(matrix.os, 'windows')
         shell: powershell
         run: |
           yarn global add --production windows-build-tools --vs2015 --msvs_version=2015
-          
+
       - name: Install node-gyp
         if: startsWith(matrix.os, 'windows')
         shell: powershell