From 00de482767d012b9b508abdc84aadc7dcc073c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Tue, 17 Sep 2019 10:49:00 +0300
Subject: [PATCH] re-enable desktop builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 ci/Jenkinsfile.combined                       | 30 +++++++++----------
 deployment/windows/nsis/setup.nsi             |  3 --
 .../react_native/js_dependencies.cljs         |  2 ++
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
index a3d94fd0d4..53b8672968 100644
--- a/ci/Jenkinsfile.combined
+++ b/ci/Jenkinsfile.combined
@@ -27,15 +27,15 @@ pipeline {
     }
     stage('Build') {
       parallel {
-        //stage('MacOS') { steps { script {
-        //  osx    = cmn.ci.Build('status-react/combined/desktop-macos')
-        //} } }
-        //stage('Linux') { steps { script {
-        //  nix    = cmn.ci.Build('status-react/combined/desktop-linux')
-        //} } }
-        //stage('Windows') { steps { script {
-        //  win    = cmn.ci.Build('status-react/combined/desktop-windows')
-        //} } }
+        stage('MacOS') { steps { script {
+          osx    = cmn.ci.Build('status-react/combined/desktop-macos')
+        } } }
+        stage('Linux') { steps { script {
+          nix    = cmn.ci.Build('status-react/combined/desktop-linux')
+        } } }
+        stage('Windows') { steps { script {
+          win    = cmn.ci.Build('status-react/combined/desktop-windows')
+        } } }
         //stage('iOS e2e') { steps { script {
         //  iose2e = cmn.ci.Build('status-react/combined/mobile-ios-e2e')
         //} } }
@@ -53,11 +53,11 @@ pipeline {
     stage('Archive') {
       steps { script {
         sh('rm -f pkg/*')
-        //if (btype != 'release') {
-        //  cmn.ci.copyArts(osx)
-        //  cmn.ci.copyArts(nix)
-        //  cmn.ci.copyArts(win)
-        //}
+        if (btype != 'release') {
+          cmn.ci.copyArts(osx)
+          cmn.ci.copyArts(nix)
+          cmn.ci.copyArts(win)
+        }
         cmn.ci.copyArts(ios)
         //cmn.ci.copyArts(iose2e)
         cmn.ci.copyArts(apk)
@@ -78,7 +78,7 @@ pipeline {
           iOS: cmn.pkgUrl(ios), /*iOSe2e: cmn.pkgUrl(iose2e),*/
           Diawi: cmn.utils.getEnv(ios, 'DIAWI_URL'),
           /* desktop */
-          //App: cmn.pkgUrl(nix), Mac: cmn.pkgUrl(osx), Win: cmn.pkgUrl(win),
+          App: cmn.pkgUrl(nix), Mac: cmn.pkgUrl(osx), Win: cmn.pkgUrl(win),
           /* upload the sha256 checksums file too */
           SHA: cmn.utils.uploadArtifact(cmn.utils.pkgFind('sha256')),
         ]
diff --git a/deployment/windows/nsis/setup.nsi b/deployment/windows/nsis/setup.nsi
index 8680749837..c61ed0f3eb 100644
--- a/deployment/windows/nsis/setup.nsi
+++ b/deployment/windows/nsis/setup.nsi
@@ -635,9 +635,6 @@ Section "Status Desktop" SecMain
   SetOutPath "$INSTDIR\assets\resources\fonts"
   File /r "${top_srcdir}\resources\fonts\"
 
-  SetOutPath "$INSTDIR\assets\resources\icons"
-  File /r "${top_srcdir}\resources\icons\"
-
   SetOutPath "$INSTDIR\assets\resources\images"
   File /r "${top_srcdir}\resources\images\"
 
diff --git a/react-native/src/desktop/status_im/react_native/js_dependencies.cljs b/react-native/src/desktop/status_im/react_native/js_dependencies.cljs
index a837a56c39..02ba7e88e3 100644
--- a/react-native/src/desktop/status_im/react_native/js_dependencies.cljs
+++ b/react-native/src/desktop/status_im/react_native/js_dependencies.cljs
@@ -35,3 +35,5 @@
 (def react-native-shake     #js {})
 (def net-info               #js {:default #js {}})
 (def react-native-mail      #js {:mail (fn [])})
+(def async-storage          #js {})
+(def back-handler           #js {})