Merge branch 'develop' into issue-13832

status-im · Sep 3, 2022 · 4f52d28 · 4f52d28
2 parents b160f34 + 6fa1729
commit 4f52d28
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 13 deletions.
diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.2'
+library 'status-jenkins-lib@v1.5.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.2'
+library 'status-jenkins-lib@v1.5.3'
 
 pipeline {
   agent { label 'linux' }
@@ -50,7 +50,7 @@ pipeline {
           apke2e = jenkins.Build('status-mobile/platforms/android-e2e')
         } } }
         stage('Tests') { steps { script {
-          ios = jenkins.Build('status-mobile/platforms/tests')
+          jenkins.Build('status-mobile/platforms/tests')
         } } }
       }
     }

diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.2'
+library 'status-jenkins-lib@v1.5.3'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

diff --git a/ci/Jenkinsfile.nix-cache b/ci/Jenkinsfile.nix-cache
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.2'
+library 'status-jenkins-lib@v1.5.3'
 
 pipeline {
   agent { label params.AGENT_LABEL }

diff --git a/ci/tests/Jenkinsfile.e2e-prs b/ci/tests/Jenkinsfile.e2e-prs
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.2'
+library 'status-jenkins-lib@v1.5.3'
 
 pipeline {
 

diff --git a/ci/tools/Jenkinsfile.fastlane-clean b/ci/tools/Jenkinsfile.fastlane-clean
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.2'
+library 'status-jenkins-lib@v1.5.3'
 
 pipeline {
   agent { label 'macos' }

diff --git a/ci/tools/Jenkinsfile.playstore-meta b/ci/tools/Jenkinsfile.playstore-meta
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.5.2'
+library 'status-jenkins-lib@v1.5.3'
 
 pipeline {
   agent { label 'linux' }

diff --git a/nix/nix.conf b/nix/nix.conf
@@ -9,7 +9,7 @@ max-jobs = auto
 # Helps avoid removing currently used dependencies via garbage collection
 keep-derivations = true
 keep-outputs = true
-# Extra isolation for network and filesystem, doesn't work on MacOS
-build-use-sandbox = false
+# Some builds on MacOS have issue with sandbox so they are disabled with __noChroot.
+sandbox = relaxed
 # Enable Nix v2 interface.
 experimental-features = nix-command
diff --git a/nix/status-go/mobile/build.nix b/nix/status-go/mobile/build.nix
@@ -18,6 +18,10 @@ in buildGoPackage {
   inherit meta;
   inherit (source) src goPackagePath;
 
+  # Sandbox causes Xcode issues on MacOS. Requires sandbox=relaxed.
+  # https://github.com/status-im/status-mobile/pull/13912
+  __noChroot = (platform == "ios");
+
   extraSrcPaths = [ gomobile ];
   nativeBuildInputs = [ gomobile removeReferencesTo ]
     ++ optional (platform == "android") openjdk

diff --git a/src/mocks/js_dependencies.cljs b/src/mocks/js_dependencies.cljs
@@ -26,6 +26,7 @@
             :View                     {}
             :RefreshControl           {}
             :AppState                 {}
+            :Alert                    {:alert (fn [])}
             :FlatList                 {}
             :SectionList              {}
             :Text                     {}
@@ -136,6 +137,7 @@
                                                    :setDefaultOptions identity
                                                    :setRoot identity
                                                    :dismissOverlay #(js/Promise.resolve)
+                                                   :showOverlay identity
                                                    :setLazyComponentRegistrator identity
                                                    :pop identity
                                                    :push identity

diff --git a/src/status_im/integration_test.cljs b/src/status_im/integration_test.cljs
@@ -4,6 +4,7 @@
             [clojure.string :as string]
             [re-frame.core :as rf]
             status-im.events
+            [status-im.utils.security :as security]
             [status-im.multiaccounts.logout.core :as logout]
             [status-im.transport.core :as transport]
             status-im.subs ;;so integration tests can run independently
@@ -174,5 +175,33 @@
          (rf-test/wait-for [::logout/logout-method] ; we need to logout to make sure the node is not in an inconsistent state between tests
                            (assert-logout)))))))))
 
+(def multiaccount-name "Narrow Frail Lemming")
+(def multiaccount-mnemonic "tattoo ramp health green tongue universe style vapor become tape lava reason")
+(def multiaccount-key-uid "0x694b8229524820a3a00a6e211141561d61b251ad99d6b65daf82a73c9a57697b")
+
+(deftest recover-multiaccount-test
+  (log/info "========= recover-multiaccount-test ==================")
+  (rf-test/run-test-async
+   (initialize-app!)
+   (rf-test/wait-for
+    [:status-im.init.core/initialize-view]
+    (rf/dispatch-sync [:init-root :onboarding])
+    (rf/dispatch-sync [:multiaccounts.recover.ui/recover-multiaccount-button-pressed])
+    (rf/dispatch-sync [:status-im.multiaccounts.recover.core/enter-phrase-pressed])
+    (rf/dispatch-sync [:multiaccounts.recover/enter-phrase-input-changed
+                       (security/mask-data multiaccount-mnemonic)])
+    (rf/dispatch [:multiaccounts.recover/enter-phrase-next-pressed])
+    (rf-test/wait-for
+     [:status-im.multiaccounts.recover.core/import-multiaccount-success]
+     (rf/dispatch-sync [:multiaccounts.recover/re-encrypt-pressed])
+     (rf/dispatch [:multiaccounts.recover/enter-password-next-pressed password])
+     (rf-test/wait-for
+      [:status-im.multiaccounts.recover.core/store-multiaccount-success]
+      (let [multiaccount @(rf/subscribe [:multiaccount])] ; assert multiaccount is recovered
+        (is (= multiaccount-key-uid (:key-uid multiaccount)))
+        (is (= multiaccount-name (:name multiaccount))))
+      (logout!) (rf-test/wait-for [::logout/logout-method]
+                                  (assert-logout)))))))
+
 (comment
   (run-tests))
diff --git a/src/status_im/utils/test.cljs b/src/status_im/utils/test.cljs
@@ -48,7 +48,6 @@
                                     settings
                                     config
                                     accounts-data))
-
             :logout (fn []
                       (.logout native-status))
             :generateAliasAndIdenticonAsync (fn [seed callback]
@@ -60,6 +59,11 @@
                                                        (.multiAccountGenerateAndDeriveAddresses
                                                         native-status
                                                         json)))
+            :multiAccountImportMnemonic (fn [json callback]
+                                          (callback
+                                           (.multiAccountImportMnemonic
+                                            native-status
+                                            json)))
             :multiAccountLoadAccount (fn [json callback]
                                        (callback
                                         (.multiAccountLoadAccount
@@ -75,8 +79,11 @@
                              (.initKeystore
                               native-status
                               (str test-dir "/keystore/" key-uid))))
-
             :identicon (fn [pk]
                          (.identicon native-status pk))
-
+            :validateMnemonic (fn [json callback]
+                                (callback
+                                 (.validateMnemonic
+                                  native-status
+                                  json)))
             :startLocalNotifications identity}))