update

status-im · Sep 3, 2024 · 0b36516 · 0b36516
1 parent 89b1004
commit 0b36516
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 34 deletions.
diff --git a/src/legacy/status_im/pairing/core.cljs b/src/legacy/status_im/pairing/core.cljs
@@ -247,7 +247,7 @@
   {:events [:pairing/finish-seed-phrase-fallback-syncing]}
   [{:keys [db]}]
   {:fx [[:json-rpc/call
-         [{:method      "wakuext_finishPairingThroughSeedPhraseProcess"
+         [{:method      "wakuext_enableInstallationAndPair"
            :params      [{:installationId (:syncing/installation-id db)}]
            :js-response true
            :on-success  #(rf/dispatch [:sanitize-messages-and-process-response %])}]]]})

diff --git a/src/status_im/common/new_device_sheet/view.cljs b/src/status_im/common/new_device_sheet/view.cljs
@@ -45,32 +45,31 @@
      :button-one-props {:on-press #(pair-and-sync installation-id)}}]])
 
 (defn installation-request-creator-view
-  []
-  (let [installation-id (rf/sub [:profile/installation-id])]
-    (rn/use-mount events-helper/dismiss-keyboard)
-    [:<>
-     [quo/text
-      {:weight              :semi-bold
-       :size                :heading-2
-       :accessibility-label :new-device-sheet-heading
-       :style               style/heading}
-      (i18n/label :t/pair-this-device-and-sync)]
-     [quo/text
-      {:weight              :regular
-       :size                :paragraph-1
-       :accessibility-label :new-device-sheet-message
-       :style               style/message}
-      (i18n/label :t/new-device-detected-other-device-message)]
-     [quo/text
-      {:weight              :semi-bold
-       :size                :heading-2
-       :accessibility-label :new-device-installation-id
-       :style               style/heading}
-      installation-id]
-     [quo/bottom-actions
-      {:actions          :one-action
-       :blur?            true
-       :container-style  {:margin-top 12}
-       :button-one-label (i18n/label :t/close)
-       :button-one-props {:type     :grey
-                          :on-press events-helper/hide-bottom-sheet}}]]))
+  [installation-id]
+  (rn/use-mount events-helper/dismiss-keyboard)
+  [:<>
+   [quo/text
+    {:weight              :semi-bold
+     :size                :heading-2
+     :accessibility-label :new-device-sheet-heading
+     :style               style/heading}
+    (i18n/label :t/pair-this-device-and-sync)]
+   [quo/text
+    {:weight              :regular
+     :size                :paragraph-1
+     :accessibility-label :new-device-sheet-message
+     :style               style/message}
+    (i18n/label :t/new-device-detected-other-device-message)]
+   [quo/text
+    {:weight              :semi-bold
+     :size                :heading-2
+     :accessibility-label :new-device-installation-id
+     :style               style/heading}
+    installation-id]
+   [quo/bottom-actions
+    {:actions          :one-action
+     :blur?            true
+     :container-style  {:margin-top 12}
+     :button-one-label (i18n/label :t/close)
+     :button-one-props {:type     :grey
+                        :on-press events-helper/hide-bottom-sheet}}]])
diff --git a/src/status_im/contexts/shell/activity_center/notification/syncing/view.cljs b/src/status_im/contexts/shell/activity_center/notification/syncing/view.cljs
@@ -30,7 +30,7 @@
                                       {:content
                                        (fn []
                                          [new-device-sheet/installation-request-creator-view
-                                          (:id installationId)])}]))
+                                          installationId])}]))
                       [installationId])]
     [swipeable {:extra-fn extra-fn}
      [quo/activity-log
@@ -59,7 +59,7 @@
                                                 {:content
                                                  (fn []
                                                    [new-device-sheet/installation-request-receiver-view
-                                                    (:id installationId)])}]))
+                                                    installationId])}]))
                                 [installationId])]
     [swipeable {:extra-fn extra-fn}
      [quo/activity-log

diff --git a/status-go-version.json b/status-go-version.json
@@ -4,6 +4,6 @@
     "owner": "status-im",
     "repo": "status-go",
     "version": "feat/enable_sync_fallback",
-    "commit-sha1": "ddc034270a5eb12938a7092e69811c043f417769",
-    "src-sha256": "1i8j5ri839xizwc7v2h45bxpg80v4k2i437578r7y32m1ipw3rxk"
+    "commit-sha1": "200389cc08230666dd853805c85a4051b2ba89ab",
+    "src-sha256": "1gyqc9f1zrpy2cng6gjxzq5n286kw7j1lkc0n3zs38m8x0snj1a3"
 }