Desktop works with react-navigation v3

status-im · Sep 25, 2019 · d111b0d · d111b0d
1 parent 3ee52b4
commit d111b0d
Show file tree

Hide file tree

Showing 157 changed files with 587 additions and 338 deletions.
diff --git a/.env b/.env
@@ -19,5 +19,5 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=0
+MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_PROTOCOL=0
diff --git a/.env.e2e b/.env.e2e
@@ -17,4 +17,4 @@ SNOOPY=0
 STICKERS_ENABLED=1
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=0
+MOBILE_UI_FOR_DESKTOP=1
diff --git a/.env.jenkins b/.env.jenkins
@@ -19,4 +19,4 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=0
+MOBILE_UI_FOR_DESKTOP=1
diff --git a/.env.nightly b/.env.nightly
@@ -17,5 +17,5 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=0
+MOBILE_UI_FOR_DESKTOP=1
 HARDWALLET_ENABLED=1
diff --git a/.env.release b/.env.release
@@ -16,4 +16,4 @@ POW_TIME=1
 SNOOPY=0
 RPC_NETWORKS_ONLY=1
 PARTITIONED_TOPIC=0
-MOBILE_UI_FOR_DESKTOP=0
+MOBILE_UI_FOR_DESKTOP=1
diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
@@ -22,7 +22,7 @@ pipeline {
         cmn = load('ci/common.groovy')
         gh  = load('ci/github.groovy')
         /* just for a shorter access */
-        btype = cmn.utils.getBuildType() 
+        btype = cmn.utils.getBuildType()
       } }
     }
     stage('Build') {

diff --git a/clj-rn.conf.edn b/clj-rn.conf.edn
@@ -73,14 +73,15 @@
                    "react-native-desktop-config"
                    "react-native-desktop-shortcuts"
                    "react-native-desktop-notification"
+                   "react-native-desktop-gesture-handler"
                    "web3-utils"
                    "react-navigation"
                    "react-native-navigation-twopane"
                    "hi-base32"]
 
  ;; Resoures
  :resource-dirs ["resources/images"
-                 "resources/icons"]
+                 "desktop/resources"]
 
  :figwheel-options {:nrepl-port 7888
                     :nrepl-middleware ["cider.nrepl/cider-middleware"

diff --git a/components/src/status_im/ui/components/react.cljs b/components/src/status_im/ui/components/react.cljs
@@ -26,7 +26,9 @@
 (def native-modules (.-NativeModules js-dependencies/react-native))
 (def device-event-emitter (.-DeviceEventEmitter js-dependencies/react-native))
 
-(def dismiss-keyboard! js-dependencies/dismiss-keyboard)
+(def dismiss-keyboard! (if platform/desktop?
+                         #()
+                         js-dependencies/dismiss-keyboard))
 
 (def splash-screen (.-SplashScreen native-modules))
 
@@ -224,8 +226,9 @@
          (.catch show-access-error)))))
 
 ;; Net info
-
-(def net-info (.-default js-dependencies/net-info))
+(def net-info (if platform/desktop?
+                (get-react-property "NetInfo")
+                (.-default js-dependencies/net-info)))
 
 ;; Clipboard