Desktop works with react-navigation v3

Signed-off-by: Volodymyr Kozieiev <vkjr.sp@gmail.com>

.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

.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

.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

.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

.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

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') {

clj-rn.conf.edn

@@ -72,6 +72,7 @@
                    "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"
@@ -79,7 +80,7 @@
 
  ;; Resoures
  :resource-dirs ["resources/images"
-                 "resources/icons"]
+                 "desktop/resources"]
 
  :figwheel-options {:nrepl-port 7888
                     :nrepl-middleware ["cider.nrepl/cider-middleware"

components/src/status_im/ui/components/react.cljs

@@ -224,8 +224,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
 

deployment/windows/nsis/setup.nsi

@@ -1,7 +1,7 @@
 ;--------------------------------
 ; Build environment
 ;--------------------------------
- 
+
   ;Unicode true
   ;!define top_srcdir @top_srcdir@
   ;!define base_image_dir ""
@@ -23,15 +23,15 @@
   !define               UninstallRegKeyPath         "Software\Microsoft\Windows\CurrentVersion\Uninstall\Status Desktop"
 
   !addplugindir         plugins/x86-ansi
- 
+
 ;--------------------------------
 ;General
 ;--------------------------------
- 
+
   ;Name and file
   Name    "Status Desktop ${VERSION}"
   OutFile "${top_srcdir}/${SetupExeFileName}"
-  
+
   SetCompressor /FINAL ${COMPRESSION_TYPE} ${COMPRESSION_ALGO}
 
   ; Default installation folder
@@ -86,7 +86,7 @@
 ;--------------------------------
 ;Variables
 ;--------------------------------
- 
+
   Var MUI_TEMP
   Var STARTMENU_FOLDER
   Var PREVIOUS_INSTALLDIR
@@ -108,16 +108,16 @@
 ;--------------------------------
 ;Interface Settings
 ;--------------------------------
- 
+
   !define MUI_ICON "${top_srcdir}/deployment/windows/status.ico"
   ;!define MUI_UNICON "${srcdir}/uninstall.ico"
- 
+
   !define MUI_ABORTWARNING
 
 ;--------------------------------
 ;Memento settings
 ;--------------------------------
- 
+
 ;!define MEMENTO_REGISTRY_ROOT SHELL_CONTEXT
 ;!define MEMENTO_REGISTRY_KEY "${AppRegistryKeyPath}"
 
@@ -159,11 +159,11 @@ Function GetUserInfo
   ${Else}
     StrCpy $IS_ADMIN 0
   ${EndIf}
- 
+
 FunctionEnd
 
 Function UpdateShellVarContext
- 
+
   ${If} $ALL_USERS == 1
     SetShellVarContext all
     DetailPrint "Installing for all users"
@@ -262,31 +262,31 @@ Function ReadPreviousVersion
 FunctionEnd
 
 Function LoadPreviousSettings
- 
+
   ; Component selection
   ;${MementoSectionRestore}
- 
+
   ; Startmenu
   !define ID "Application"
- 
+
   !ifdef MUI_STARTMENUPAGE_${ID}_REGISTRY_ROOT & MUI_STARTMENUPAGE_${ID}_REGISTRY_KEY & MUI_STARTMENUPAGE_${ID}_REGISTRY_VALUENAME
- 
+
     ReadRegStr $mui.StartMenuPage.RegistryLocation "${MUI_STARTMENUPAGE_${ID}_REGISTRY_ROOT}" "${MUI_STARTMENUPAGE_${ID}_REGISTRY_KEY}" "${MUI_STARTMENUPAGE_${ID}_REGISTRY_VALUENAME}"
- 
+
     ${if} $mui.StartMenuPage.RegistryLocation != ""
       StrCpy "$STARTMENU_FOLDER" $mui.StartMenuPage.RegistryLocation
     ${else}
       StrCpy "$STARTMENU_FOLDER" ""
     ${endif}
- 
+
     !undef ID
- 
+
   !endif
- 
+
   ${If} $PREVIOUS_INSTALLDIR != ""
     StrCpy $INSTDIR $PREVIOUS_INSTALLDIR
   ${EndIf}
- 
+
 FunctionEnd
 
 Function ReadUpdateCommandline
@@ -339,7 +339,7 @@ Function ReadQuiet
 FunctionEnd
 
 Function .onInit
- 
+
   Pop $OldRunDir
 
   ; Store command line
@@ -382,14 +382,14 @@ uac_tryagain:
     ; The UAC plugin changes the error level even in the inner process, reset it.
     SetErrorLevel -1
   ${EndIf}
- 
+
  ; /update argument
   Call ReadUpdateCommandline
 
   Call ReadSkipLicense
 
   Call GetUserInfo
- 
+
   ; Initialize $ALL_USERS with default value
   ${If} $IS_ADMIN == 1
     StrCpy $ALL_USERS 1
@@ -397,11 +397,11 @@ uac_tryagain:
     StrCpy $ALL_USERS 0
   ${EndIf}
   Call UpdateShellVarContext
- 
+
   ; See if previous version exists
   ; This can change ALL_USERS
   Call ReadPreviousVersion
- 
+
   ${If} $PREVIOUS_VERSION != ""
     StrCpy $REINSTALL_UNINSTALL 1
   ${EndIf}
@@ -444,29 +444,29 @@ uac_tryagain:
   ${EndIf}
 
   StrCpy $ALL_USERS_DEFAULT $ALL_USERS
- 
+
 FunctionEnd
 
 Function StatusVersionCompare
- 
+
   Exch $1
   Exch
   Exch $0
- 
+
   Push $2
   Push $3
   Push $4
- 
+
 versioncomparebegin:
   ${If} $0 == ""
   ${AndIf} $1 == ""
     StrCpy $PREVIOUS_VERSION_STATE "same"
     goto versioncomparedone
   ${EndIf}
- 
+
   StrCpy $2 0
   StrCpy $3 0
- 
+
   ; Parse rc / beta suffixes for segments
   StrCpy $4 $0 2
   ${If} $4 == "rc"
@@ -480,7 +480,7 @@ versioncomparebegin:
       StrCpy $2 10000
     ${EndIf}
   ${EndIf}
- 
+
   StrCpy $4 $1 2
   ${If} $4 == "rc"
     StrCpy $3 100
@@ -493,9 +493,9 @@ versioncomparebegin:
       StrCpy $3 10000
     ${EndIf}
   ${EndIf}
- 
+
 split1loop:
- 
+
   StrCmp $0 "" split1loopdone
   StrCpy $4 $0 1
   StrCpy $0 $0 "" 1
@@ -504,9 +504,9 @@ split1loop:
   StrCpy $2 $2$4
   goto split1loop
 split1loopdone:
- 
+
 split2loop:
- 
+
   StrCmp $1 "" split2loopdone
   StrCpy $4 $1 1
   StrCpy $1 $1 "" 1
@@ -515,7 +515,7 @@ split2loop:
   StrCpy $3 $3$4
   goto split2loop
 split2loopdone:
- 
+
   ${If} $2 > $3
     StrCpy $PREVIOUS_VERSION_STATE "newer"
   ${ElseIf} $3 > $2
@@ -523,16 +523,16 @@ split2loopdone:
   ${Else}
     goto versioncomparebegin
   ${EndIf}
- 
- 
+
+
 versioncomparedone:
- 
+
   Pop $4
   Pop $3
   Pop $2
   Pop $1
   Pop $0
- 
+
 FunctionEnd
 
 Function PageDirectoryPre
@@ -573,11 +573,11 @@ FunctionEnd
 
 Function .OnInstFailed
 FunctionEnd
- 
+
 Function .onInstSuccess
- 
+
   ;${MementoSectionSave}
- 
+
 
   ; Detect multiple install directories
   ${If} $OldRunDir != ''
@@ -615,10 +615,10 @@ Section "Status Desktop" SecMain
     DetailPrint "${NodeJsServerExeName} is running. Closing it down"
     ${nsProcess::CloseProcess} "${NodeJsServerExeName}" $R0
     DetailPrint "Waiting for ${NodeJsServerExeName} to close"
-    Sleep 2000  
+    Sleep 2000
   ${Else}
-    DetailPrint "${NodeJsServerExeName} was not found to be running"        
-  ${EndIf}    
+    DetailPrint "${NodeJsServerExeName} was not found to be running"
+  ${EndIf}
 
   ${nsProcess::Unload}
 
@@ -635,6 +635,9 @@ Section "Status Desktop" SecMain
   SetOutPath "$INSTDIR\assets\resources\fonts"
   File /r "${top_srcdir}\resources\fonts\"
 
+  SetOutPath "$INSTDIR\assets\desktop\resources"
+  File /r "${top_srcdir}\desktop\resources\"
+
   SetOutPath "$INSTDIR\assets\resources\images"
   File /r "${top_srcdir}\resources\images\"
 
@@ -713,7 +716,7 @@ Section "Status Desktop" SecMain
   WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\App Paths\${AppExeName}" "Path" "$INSTDIR"
 
 SectionEnd
- 
+
 ;--------------------------------
 ; Functions
 ;--------------------------------
@@ -765,14 +768,14 @@ FunctionEnd
 ;--------------------------------
 ; Uninstaller Variables
 ;--------------------------------
- 
+
 Var un.REMOVE_ALL_USERS
 Var un.REMOVE_CURRENT_USER
- 
+
 ;--------------------------------
 ;Uninstaller Functions
 ;--------------------------------
- 
+
 Function un.GetUserInfo
   ClearErrors
   UserInfo::GetName
@@ -787,13 +790,13 @@ Function un.GetUserInfo
   ${Else}
     StrCpy $IS_ADMIN 0
   ${EndIf}
- 
+
 FunctionEnd
- 
+
 Function un.ReadPreviousVersion
- 
+
   ReadRegStr $R0 HKLM "${AppRegistryKeyPath}" ""
- 
+
   ${If} $R0 != ""
     ;Detect version
     ReadRegStr $R2 HKLM "${AppRegistryKeyPath}" "Version"
@@ -801,9 +804,9 @@ Function un.ReadPreviousVersion
       StrCpy $R0 ""
     ${EndIf}
   ${EndIf}
- 
+
   ReadRegStr $R1 HKCU "${AppRegistryKeyPath}" ""
- 
+
   ${If} $R1 != ""
     ;Detect version
     ReadRegStr $R2 HKCU "${AppRegistryKeyPath}" "Version"
@@ -811,7 +814,7 @@ Function un.ReadPreviousVersion
       StrCpy $R1 ""
     ${EndIf}
   ${EndIf}
- 
+
   ${If} $R1 == $INSTDIR
     Strcpy $un.REMOVE_CURRENT_USER 1
   ${EndIf}
@@ -829,11 +832,11 @@ Function un.ReadPreviousVersion
       StrCpy $un.REMOVE_ALL_USERS = 1
     ${EndIf}
   ${EndIf}
- 
+
 FunctionEnd
- 
+
 Function un.onInit
- 
+
   ${un.GetParameters} $CommandLine
 
   ${un.GetOptions} $CommandLine "/quiet" $R1
@@ -846,7 +849,7 @@ Function un.onInit
 
   Call un.GetUserInfo
   Call un.ReadPreviousVersion
- 
+
   ${If} $un.REMOVE_ALL_USERS == 1
   ${AndIf} $IS_ADMIN == 0
 uac_tryagain:
@@ -869,16 +872,16 @@ uac_tryagain:
     ; The UAC plugin changes the error level even in the inner process, reset it.
     SetErrorLevel -1
   ${EndIf}
- 
+
 FunctionEnd
- 
+
 Function un.RemoveStartmenu
- 
+
   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
- 
+
   Delete "$SMPROGRAMS\$MUI_TEMP\${UninstallLinkName}"
   Delete "$SMPROGRAMS\$MUI_TEMP\${AppLinkFileName}"
- 
+
   ${un.GetOptions} $CommandLine "/keepstartmenudir" $R1
   ${If} ${Errors}
 
@@ -922,7 +925,7 @@ FunctionEnd
 ;--------------------------------
 
 Section "Uninstall"
-  
+
   SetShellVarContext all
 
   SetDetailsPrint lastused
@@ -933,10 +936,10 @@ Section "Uninstall"
     DetailPrint "${AppExeName} is running. Closing it down"
     ${nsProcess::CloseProcess} "${AppExeName}" $R0
     DetailPrint "Waiting for ${AppExeName} to close"
-    Sleep 2000  
+    Sleep 2000
   ${Else}
-    DetailPrint "${AppExeName} was not found to be running"        
-  ${EndIf}    
+    DetailPrint "${AppExeName} was not found to be running"
+  ${EndIf}
 
   ${nsProcess::FindProcess} "${NodeJsServerExeName}" $R0
 
@@ -944,10 +947,10 @@ Section "Uninstall"
     DetailPrint "${NodeJsServerExeName} is running. Closing it down"
     ${nsProcess::CloseProcess} "${NodeJsServerExeName}" $R0
     DetailPrint "Waiting for ${NodeJsServerExeName} to close"
-    Sleep 2000  
+    Sleep 2000
   ${Else}
-    DetailPrint "${NodeJsServerExeName} was not found to be running"        
-  ${EndIf}    
+    DetailPrint "${NodeJsServerExeName} was not found to be running"
+  ${EndIf}
 
   ${nsProcess::Unload}
 
@@ -984,7 +987,7 @@ Section "Uninstall"
   RMDir "$INSTDIR\translations"
 
   Delete "$INSTDIR"
-  
+
   ${un.GetOptions} $CommandLine "/frominstall" $R1
   ${If} ${Errors}
     RMDir /r /REBOOTOK "$INSTDIR"
@@ -997,11 +1000,11 @@ Section "Uninstall"
   ${If} $un.REMOVE_ALL_USERS == 1
     SetShellVarContext all
     Call un.RemoveStartmenu
-  
+
     DeleteRegKey /ifempty HKLM "${AppRegistryKeyPath}"
     DeleteRegKey /ifempty HKLM "${OrgRegistryKeyPath}"
     DeleteRegKey HKLM "${UninstallRegKeyPath}"
-  
+
     Delete "$DESKTOP\${AppLinkFileName}"
 
     ; Remove dump key
@@ -1025,7 +1028,7 @@ Section "Uninstall"
 
     Delete "$DESKTOP\${AppLinkFileName}"
   ${EndIf}
-  
+
   DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\App Paths\${AppExeName}"
 
 SectionEnd

desktop/build.bat

@@ -25,6 +25,7 @@ SET option
 echo "build.bat external modules paths: "%option-e%
 echo "build.bat JS bundle path: "%option-j%
 echo "build.bat desktop fonts: "%option-f%
+echo "build.bat desktop images: "%option-i%
 echo "build.bat cmake generator: "%option-g%
 
 @rem Workaround
@@ -32,4 +33,4 @@ echo "build.bat cmake generator: "%option-g%
 
 @rem Build project
 echo %CD%
-cmake -DCMAKE_BUILD_TYPE=Debug -G %option-g% -DEXTERNAL_MODULES_DIR=%option-e% -DJS_BUNDLE_PATH=%option-j% -DDESKTOP_FONTS=%option-f% . && cmake --build .
+cmake -DCMAKE_BUILD_TYPE=Debug -G %option-g% -DEXTERNAL_MODULES_DIR=%option-e% -DJS_BUNDLE_PATH=%option-j% -DDESKTOP_FONTS=%option-f% -DDESKTOP_IMAGES=%option-i% . && cmake --build .

desktop/build.sh

@@ -23,12 +23,17 @@ if [[ $1 == "-f" ]]; then
   shift
 	desktopFonts="$1"
 fi
+if [[ $1 == "-i" ]]; then
+  shift
+  desktopImages="$1"
+fi
 shift
 done
 
 echo "build.sh external modules paths: "$ExternalModulesPaths
 echo "build.sh JS bundle path: "$JsBundlePath
 echo "build.sh desktop fonts: "$desktopFonts
+echo "build.sh desktop images: "$desktopImages
 
 # Workaround
 rm -rf CMakeFiles CMakeCache.txt cmake_install.cmake Makefile
@@ -38,6 +43,7 @@ cmake -DCMAKE_BUILD_TYPE=Debug \
       -DEXTERNAL_MODULES_DIR="$ExternalModulesPaths" \
       -DJS_BUNDLE_PATH="$JsBundlePath" \
       -DDESKTOP_FONTS="$desktopFonts" \
+      -DDESKTOP_IMAGES="$desktopImages" \
       -DCMAKE_INSTALL_COMPONENT='' \
       . && \
 make

desktop/js_files/package.json

@@ -18,6 +18,7 @@
     "modules/react-native-desktop-config/desktop",
     "modules/react-native-desktop-shortcuts/desktop",
     "modules/react-native-desktop-notification/desktop",
+    "modules/react-native-desktop-gesture-handler/desktop",
     "node_modules/google-breakpad"
   ],
   "desktopFonts": [
@@ -60,13 +61,14 @@
     "qrcode": "^1.4.1",
     "react": "16.6.1",
     "react-dom": "16.4.2",
-    "react-native": "git+https://github.com/status-im/react-native-desktop.git#v0.57.8_10",
+    "react-native": "git+https://github.com/status-im/react-native-desktop.git#v0.57.8_11",
     "react-native-background-timer": "2.0.0",
     "react-native-camera": "0.10.0",
     "react-native-config": "git+https://github.com/status-im/react-native-config.git#v0.11.2-status",
     "react-native-dialogs": "0.0.20",
     "react-native-fetch-polyfill": "1.1.2",
     "react-native-fs": "git+https://github.com/status-im/react-native-fs.git#v2.9.7-status",
+    "react-native-gesture-handler": "^1.3.0",
     "react-native-image-crop-picker": "0.18.1",
     "react-native-image-resizer": "1.0.0",
     "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#v.3.0.0-4-status",
@@ -75,7 +77,7 @@
     "react-native-os": "1.1.0",
     "react-native-splash-screen": "3.0.6",
     "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#0.33.16-status-rn049-desktop",
-    "react-navigation": "^2.12.1",
+    "react-navigation": "^3.11.0",
     "status-conan": "git+https://github.com/status-im/status-conan.git#v1.0.0",
     "web3-utils": "1.0.0-beta.36"
   },
@@ -93,5 +95,122 @@
   },
   "optionalDependencies": {
     "appdmg": "^0.5.2"
-  }
+  },
+  "desktopImages": [
+    "../../../../../desktop/resources/add.png",
+    "../../../../../desktop/resources/address.png",
+    "../../../../../desktop/resources/add_contact.png",
+    "../../../../../desktop/resources/arrow_left.png",
+    "../../../../../desktop/resources/arrow_right.png",
+    "../../../../../desktop/resources/arrow_up.png",
+    "../../../../../desktop/resources/back.png",
+    "../../../../../desktop/resources/backspace.png",
+    "../../../../../desktop/resources/bell.png",
+    "../../../../../desktop/resources/browser.png",
+    "../../../../../desktop/resources/camera.png",
+    "../../../../../desktop/resources/cancel.png",
+    "../../../../../desktop/resources/change.png",
+    "../../../../../desktop/resources/check.png",
+    "../../../../../desktop/resources/close.png",
+    "../../../../../desktop/resources/commands.png",
+    "../../../../../desktop/resources/copy.png",
+    "../../../../../desktop/resources/corner_left_bottom.png",
+    "../../../../../desktop/resources/corner_left_top.png",
+    "../../../../../desktop/resources/corner_right_bottom.png",
+    "../../../../../desktop/resources/corner_right_top.png",
+    "../../../../../desktop/resources/dapp.png",
+    "../../../../../desktop/resources/delete.png",
+    "../../../../../desktop/resources/desktop.png",
+    "../../../../../desktop/resources/download.png",
+    "../../../../../desktop/resources/dropdown.png",
+    "../../../../../desktop/resources/dropdown_up.png",
+    "../../../../../desktop/resources/edit.png",
+    "../../../../../desktop/resources/filter.png",
+    "../../../../../desktop/resources/fingerprint.png",
+    "../../../../../desktop/resources/flash.png",
+    "../../../../../desktop/resources/flash_active.png",
+    "../../../../../desktop/resources/group_chat.png",
+    "../../../../../desktop/resources/help.png",
+    "../../../../../desktop/resources/history.png",
+    "../../../../../desktop/resources/home.png",
+    "../../../../../desktop/resources/home_1.png",
+    "../../../../../desktop/resources/icon_action_back.png",
+    "../../../../../desktop/resources/icon_action_forward.png",
+    "../../../../../desktop/resources/icon_action_fullscreen_collapse.png",
+    "../../../../../desktop/resources/icon_action_fullscreen_expand.png",
+    "../../../../../desktop/resources/icon_arrow_top.png",
+    "../../../../../desktop/resources/icon_avatar.png",
+    "../../../../../desktop/resources/icon_check_on.png",
+    "../../../../../desktop/resources/icon_close_light_gray.png",
+    "../../../../../desktop/resources/icon_forward_gray.png",
+    "../../../../../desktop/resources/icon_lock_gray.png",
+    "../../../../../desktop/resources/icon_lock_white.png",
+    "../../../../../desktop/resources/icon_menu_group.png",
+    "../../../../../desktop/resources/icon_money_white.png",
+    "../../../../../desktop/resources/icon_muted.png",
+    "../../../../../desktop/resources/icon_notifications_on.png",
+    "../../../../../desktop/resources/icon_phone_white.png",
+    "../../../../../desktop/resources/ic_background.png",
+    "../../../../../desktop/resources/ic_foreground.png",
+    "../../../../../desktop/resources/ic_stat_status_notification.png",
+    "../../../../../desktop/resources/info.png",
+    "../../../../../desktop/resources/in_contacts.png",
+    "../../../../../desktop/resources/keycard.png",
+    "../../../../../desktop/resources/keycard_logo.png",
+    "../../../../../desktop/resources/language.png",
+    "../../../../../desktop/resources/launch_logo.png",
+    "../../../../../desktop/resources/link.png",
+    "../../../../../desktop/resources/logo.png",
+    "../../../../../desktop/resources/log_out.png",
+    "../../../../../desktop/resources/mailserver.png",
+    "../../../../../desktop/resources/make_admin.png",
+    "../../../../../desktop/resources/max.png",
+    "../../../../../desktop/resources/message.png",
+    "../../../../../desktop/resources/mobile.png",
+    "../../../../../desktop/resources/more.png",
+    "../../../../../desktop/resources/network.png",
+    "../../../../../desktop/resources/next.png",
+    "../../../../../desktop/resources/notification.png",
+    "../../../../../desktop/resources/one_on_one_chat.png",
+    "../../../../../desktop/resources/password.png",
+    "../../../../../desktop/resources/paste.png",
+    "../../../../../desktop/resources/photo.png",
+    "../../../../../desktop/resources/profile.png",
+    "../../../../../desktop/resources/public_chat.png",
+    "../../../../../desktop/resources/qr.png",
+    "../../../../../desktop/resources/receive.png",
+    "../../../../../desktop/resources/refresh.png",
+    "../../../../../desktop/resources/remove_contact.png",
+    "../../../../../desktop/resources/reply.png",
+    "../../../../../desktop/resources/rotate_camera.png",
+    "../../../../../desktop/resources/search.png",
+    "../../../../../desktop/resources/security.png",
+    "../../../../../desktop/resources/send.png",
+    "../../../../../desktop/resources/settings.png",
+    "../../../../../desktop/resources/settings_advanced.png",
+    "../../../../../desktop/resources/share.png",
+    "../../../../../desktop/resources/stickers.png",
+    "../../../../../desktop/resources/text.png",
+    "../../../../../desktop/resources/tiny_arrow_down.png",
+    "../../../../../desktop/resources/tiny_check.png",
+    "../../../../../desktop/resources/tiny_clear.png",
+    "../../../../../desktop/resources/tiny_edit.png",
+    "../../../../../desktop/resources/tiny_external.png",
+    "../../../../../desktop/resources/tiny_group.png",
+    "../../../../../desktop/resources/tiny_lock.png",
+    "../../../../../desktop/resources/tiny_lock_broken.png",
+    "../../../../../desktop/resources/tiny_new_contact.png",
+    "../../../../../desktop/resources/tiny_pending.png",
+    "../../../../../desktop/resources/tiny_public.png",
+    "../../../../../desktop/resources/tiny_reply.png",
+    "../../../../../desktop/resources/tiny_settings.png",
+    "../../../../../desktop/resources/tiny_tribute_to_talk.png",
+    "../../../../../desktop/resources/tribute_to_talk.png",
+    "../../../../../desktop/resources/two_arrows.png",
+    "../../../../../desktop/resources/username.png",
+    "../../../../../desktop/resources/user_profile.png",
+    "../../../../../desktop/resources/user_profile_1.png",
+    "../../../../../desktop/resources/wallet.png",
+    "../../../../../desktop/resources/warning.png"
+  ]
 }

desktop/js_files/yarn.lock

@@ -1307,6 +1307,25 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
+"@react-navigation/core@~3.4.1":
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.4.2.tgz#bec563e94fde40fbab3730cdc97f22afbb2a1498"
+  integrity sha512-7G+iDzLSTeOUU4vVZeRZKJ+Bd7ds7ZxYNqZcB8i0KlBeQEQfR74Ounfu/p0KIEq2RiNnaE3QT7WVP3C87sebzw==
+  dependencies:
+    hoist-non-react-statics "^3.3.0"
+    path-to-regexp "^1.7.0"
+    query-string "^6.4.2"
+    react-is "^16.8.6"
+
+"@react-navigation/native@~3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.5.0.tgz#f5d16e0845ac26d1147d1caa481f18a00740e7ae"
+  integrity sha512-TmGOis++ejEXG3sqNJhCSKqB0/qLu3FQgDtO959qpqif36R/diR8SQwJqeSdofoEiK3CepdhFlTCeHdS1/+MsQ==
+  dependencies:
+    hoist-non-react-statics "^3.0.1"
+    react-native-safe-area-view "^0.14.1"
+    react-native-screens "^1.0.0 || ^1.0.0-alpha"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -2120,11 +2139,6 @@ ci-info@^1.5.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
   integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
-clamp@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/clamp/-/clamp-1.0.1.tgz#66a0e64011816e37196828fdc8c8c147312c8634"
-  integrity sha1-ZqDmQBGBbjcZaCj9yMjBRzEshjQ=
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -2468,14 +2482,6 @@ create-react-class@^15.6.3:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-create-react-context@0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.2.tgz#9836542f9aaa22868cd7d4a6f82667df38019dca"
-  integrity sha512-KkpaLARMhsTsgp0d2NA/R94F/eDLbhXERdIq3LvX2biCAXcDvHYoOqHfWCHf1+OLj+HKBotLG3KqaOOf+C1C+A==
-  dependencies:
-    fbjs "^0.8.0"
-    gud "^1.0.0"
-
 cross-spawn-async@^2.1.1:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
@@ -3159,7 +3165,7 @@ fbjs-scripts@^1.0.0:
     semver "^5.1.0"
     through2 "^2.0.0"
 
-fbjs@^0.8.0, fbjs@^0.8.16, fbjs@^0.8.9:
+fbjs@^0.8.16, fbjs@^0.8.9:
   version "0.8.17"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
   integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
@@ -3619,11 +3625,6 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-gud@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
-  integrity sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==
-
 handlebars@^4.1.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.0.tgz#57ce8d2175b9bbb3d8b3cf3e4217b1aec8ddcb2e"
@@ -3749,11 +3750,18 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoist-non-react-statics@^2.2.0, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
+hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
+hoist-non-react-statics@^3.0.1, hoist-non-react-statics@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
+  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
+  dependencies:
+    react-is "^16.7.0"
+
 home-or-tmp@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-3.0.0.tgz#57a8fe24cf33cdd524860a15821ddc25c86671fb"
@@ -6064,7 +6072,7 @@ query-string@^5.0.1:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@^6.1.0:
+query-string@^6.4.2:
   version "6.8.3"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.8.3.tgz#fd9fb7ffb068b79062b43383685611ee47777d4b"
   integrity sha512-llcxWccnyaWlODe7A9hRjkvdCKamEKTh+wH8ITdTc3OhchaqUZteiSCX/2ablWHVrkVIe04dntnaZJ7BdyW0lQ==
@@ -6148,12 +6156,12 @@ react-dom@16.4.2:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
-react-is@^16.5.2, react-is@^16.8.1:
+react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6:
   version "16.9.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
   integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
 
-react-lifecycles-compat@^3, react-lifecycles-compat@^3.0.4:
+react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
@@ -6179,25 +6187,6 @@ react-native-dialogs@0.0.20:
   resolved "https://registry.yarnpkg.com/react-native-dialogs/-/react-native-dialogs-0.0.20.tgz#f3fb48eadba9d83fb9d4e6d7eca573494a8cefaa"
   integrity sha512-HeoU9d7wWUUAtxjcIJLaeIs/eYS2ZHTNh3kboeCKngLvfvgptd/7vZXwXdQ+xeOEek+cm95kDfMJQd2xnb+4wA==
 
-react-native-dismiss-keyboard@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/react-native-dismiss-keyboard/-/react-native-dismiss-keyboard-1.0.0.tgz#32886242b3f2317e121f3aeb9b0a585e2b879b49"
-  integrity sha1-MohiQrPyMX4SHzrrmwpYXiuHm0k=
-
-react-native-drawer-layout-polyfill@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/react-native-drawer-layout-polyfill/-/react-native-drawer-layout-polyfill-1.3.2.tgz#192c84d7a5a6b8a6d2be2c7daa5e4164518d0cc7"
-  integrity sha512-XzPhfLDJrYHru+e8+dFwhf0FtTeAp7JXPpFYezYV6P1nTeA1Tia/kDpFT+O2DWTrBKBEI8FGhZnThrroZmHIxg==
-  dependencies:
-    react-native-drawer-layout "1.3.2"
-
-react-native-drawer-layout@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/react-native-drawer-layout/-/react-native-drawer-layout-1.3.2.tgz#b9740d7663a1dc4f88a61b9c6d93d2d948ea426e"
-  integrity sha512-fjO0scqbJUfNu2wuEpvywL7DYLXuCXJ2W/zYhWz986rdLytidbys1QGVvkaszHrb4Y7OqO96mTkgpOcP8KWevw==
-  dependencies:
-    react-native-dismiss-keyboard "1.0.0"
-
 react-native-fetch-polyfill@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/react-native-fetch-polyfill/-/react-native-fetch-polyfill-1.1.2.tgz#256b5a0abd78cc4992f7a7cf82543da2f2124a73"
@@ -6210,6 +6199,15 @@ react-native-fetch-polyfill@1.1.2:
     base-64 "^0.1.0"
     utf8 "^2.1.1"
 
+react-native-gesture-handler@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.3.0.tgz#d0386f565928ccc1849537f03f2e37fd5f6ad43f"
+  integrity sha512-ASRFIXBuKRvqlmwkWJhV8yP2dTpvcqVrLNpd7FKVBFHYWr6SAxjGyO9Ik8w1lAxDhMlRP2IcJ9p9eq5X2WWeLQ==
+  dependencies:
+    hoist-non-react-statics "^2.3.1"
+    invariant "^2.2.2"
+    prop-types "^15.5.10"
+
 react-native-image-crop-picker@0.18.1:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.18.1.tgz#ebdbe72def5afb6c69aa6e2ad72fd3a7de8ee408"
@@ -6237,14 +6235,14 @@ react-native-os@1.1.0:
   resolved "https://registry.yarnpkg.com/react-native-os/-/react-native-os-1.1.0.tgz#bfbe1c44d8a5b14a6f3a3a405d8ada6f547a516e"
   integrity sha1-v74cRNilsUpvOjpAXYrab1R6UW4=
 
-react-native-safe-area-view@0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.11.0.tgz#4f3dda43c2bace37965e7c6aef5fc83d4f19d174"
-  integrity sha512-N3nElaahu1Me2ltnfc9acpgt1znm6pi8DSadKy79kvdzKwvVIzw0IXueA/Hjr51eCW1BsfNw7D1SgBT9U6qEkA==
+react-native-safe-area-view@^0.14.1:
+  version "0.14.6"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.6.tgz#9a9d37d9f8f3887d60c4076eae7b5d2319539446"
+  integrity sha512-dbzuvaeHFV1VBpyMaC0gtJ2BqFt6ls/405A0t78YN1sXiTrVr3ki86Ysct8mzifWqLdvWzcWagE5wfMtdxnqoA==
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
-react-native-screens@^1.0.0-alpha.11:
+"react-native-screens@^1.0.0 || ^1.0.0-alpha":
   version "1.0.0-alpha.23"
   resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.23.tgz#25d7ea4d11bda4fcde2d1da7ae50271c6aa636e0"
   integrity sha512-tOxHGQUN83MTmQB4ghoQkibqOdGiX4JQEmeyEv96MKWO/x8T2PJv84ECUos9hD3blPRQwVwSpAid1PPPhrVEaw==
@@ -6256,14 +6254,7 @@ react-native-splash-screen@3.0.6:
   resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.0.6.tgz#c0bbf2c8ae40a313c4c7044f55e569414ff68332"
   integrity sha512-yaTnGAHRyhduLSfD85gP3Vsf0BRePHW3aNNtDXbkbUhwIIeafu2cJH86U/qKFuKLMYLnFOXteOkP80gaYVGAYg==
 
-react-native-tab-view@^0.0.77:
-  version "0.0.77"
-  resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.77.tgz#11ceb8e7c23100d07e628dc151b57797524d00d4"
-  integrity sha512-9vjD4Ly1Zlum1Y4g23ODpi/F3gYIUIsKWrsZO/Oh5cuX1eiB1DRVn11nY1z+j/hsQfhfyW6nDlmySyDvYQvYCA==
-  dependencies:
-    prop-types "^15.6.0"
-
-react-native-tab-view@^1.0.0:
+react-native-tab-view@^1.2.0, react-native-tab-view@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-1.4.1.tgz#f113cd87485808f0c991abec937f70fa380478b9"
   integrity sha512-Bke8KkDcDhvB/z0AS7MnQKMD2p6Kwfc1rSKlMOvg9CC5CnClQ2QEnhPSbwegKDYhUkBI92iH/BYy7hNSm5kbUQ==
@@ -6277,9 +6268,9 @@ react-native-tab-view@^1.0.0:
     invariant "2.2.0"
     keymirror "0.1.1"
 
-"react-native@git+https://github.com/status-im/react-native-desktop.git#v0.57.8_10":
+"react-native@git+https://github.com/status-im/react-native-desktop.git#v0.57.8_11":
   version "0.57.8"
-  resolved "git+https://github.com/status-im/react-native-desktop.git#af9f72e6300d08918685f57e249141646400bac0"
+  resolved "git+https://github.com/status-im/react-native-desktop.git#6cf317a82ef82ad1102e292110928929c3b68aec"
   dependencies:
     "@babel/runtime" "^7.0.0"
     absolute-path "^0.0.0"
@@ -6336,53 +6327,38 @@ react-native-tab-view@^1.0.0:
     yeoman-environment "^2.3.4"
     yeoman-generator "^3.2.0"
 
-react-navigation-deprecated-tab-navigator@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/react-navigation-deprecated-tab-navigator/-/react-navigation-deprecated-tab-navigator-1.3.0.tgz#015dcae1e977b984ca7e99245261c15439026bb7"
-  integrity sha512-Cm+qYOPFWbvvcuv0YYX0ioYwLGgw7XAqdhAfpo3sIr3trxRW8871ePmfFOPezjQtz4v6ItjZt6LPgtBAVZoroQ==
+react-navigation-drawer@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-1.2.1.tgz#7bd5efeee7d2f611d3ebb0933e0c8e8eb7cafe52"
+  integrity sha512-T2kaBjY2c4/3I6noWFnaf/c18ntNH5DsST38i+pdc2NPxn5Yi5lkK+ZZTeKuHSFD4a7G0jWY9OGf1iRkHWLMAQ==
   dependencies:
-    react-native-tab-view "^0.0.77"
+    react-native-tab-view "^1.2.0"
 
-react-navigation-drawer@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-0.5.0.tgz#d91b6a6ec65c34ba78c00f814b1e6508922cc9ec"
-  integrity sha512-F1y593uC6pqBMGH+Omz75oNODEbxB/s0EGO8QtYwu1NmOOEUuuLA+c14zm+pgMsI4HlDabiHxPkWqsgGz25xVQ==
-  dependencies:
-    react-native-drawer-layout-polyfill "^1.3.2"
+react-navigation-stack@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.4.0.tgz#69cdb029ea4ee5877d7e933b3117dc90bc841eb2"
+  integrity sha512-zEe9wCA0Ot8agarYb//0nSWYW1GM+1R0tY/nydUV0EizeJ27At0EklYVWvYEuYU6C48va6cu8OPL7QD/CcJACw==
 
-react-navigation-stack@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-0.7.0.tgz#0b2f139ee1cba953037ef51353df992ec6c74fa2"
-  integrity sha512-3Tbb/SsustBrM9R/qaI6XuOfyqYMVbwkeHFC8NbU890vB0aKZvjAtioWLZ18e/4LgbiOCmoTdp37z3gkGDyNDQ==
-
-react-navigation-tabs@0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.8.4.tgz#aa767f28b899f13c99f2b034b4a665f8cf0a5737"
-  integrity sha512-CbS3xIVJVtpu+AYslv0PMLmjddJFVtU3XAhSJ9XnMrKLUJNmnQdW/L0w/Gp5qcBEF9h6bgsY3CoTtp7I6bqyOQ==
+react-navigation-tabs@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-1.1.4.tgz#00a312250df3c519c60b7815a523ace5ee11163a"
+  integrity sha512-py2hLCRxPwXOzmY1W9XcY1rWXxdK6RGW/aXh56G9gIf8cpHNDhy/bJV4e46/JrVcse3ybFaN0liT09/DM/NdwQ==
   dependencies:
     hoist-non-react-statics "^2.5.0"
     prop-types "^15.6.1"
     react-lifecycles-compat "^3.0.4"
-    react-native-tab-view "^1.0.0"
+    react-native-tab-view "^1.4.1"
 
-react-navigation@^2.12.1:
-  version "2.18.3"
-  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.18.3.tgz#de9a24dc37dfc33f3e4779a9f13f45ea97dfe19e"
-  integrity sha512-/5KGMG1Oj5LN/x/7AKF0MWrpX9Qe29307RxEsMCiRT/A4jCYT0DPY99Bl7ZAGtROxExEy3rwTfTrtvpIT+CU7A==
+react-navigation@^3.11.0:
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-3.11.1.tgz#ba696ad6b512088a97a20cc7e6a250c53dbddd26"
+  integrity sha512-n64HxLG5s5ucVFo1Gs+D9ujChhHDd98lpQ1p27wL7gq8V1PaRJMvsBEIsguhtc2rTIL/TWDynOesXQDG+Eg6FQ==
   dependencies:
-    clamp "^1.0.1"
-    create-react-context "0.2.2"
-    hoist-non-react-statics "^2.2.0"
-    path-to-regexp "^1.7.0"
-    query-string "^6.1.0"
-    react-is "^16.5.2"
-    react-lifecycles-compat "^3"
-    react-native-safe-area-view "0.11.0"
-    react-native-screens "^1.0.0-alpha.11"
-    react-navigation-deprecated-tab-navigator "1.3.0"
-    react-navigation-drawer "0.5.0"
-    react-navigation-stack "0.7.0"
-    react-navigation-tabs "0.8.4"
+    "@react-navigation/core" "~3.4.1"
+    "@react-navigation/native" "~3.5.0"
+    react-navigation-drawer "~1.2.1"
+    react-navigation-stack "~1.4.0"
+    react-navigation-tabs "~1.1.4"
 
 react-proxy@^1.1.7:
   version "1.1.8"