Skip to content

Commit 0b36516

Browse files
committed
update
1 parent 89b1004 commit 0b36516

File tree

4 files changed

+33
-34
lines changed

4 files changed

+33
-34
lines changed

src/legacy/status_im/pairing/core.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
{:events [:pairing/finish-seed-phrase-fallback-syncing]}
248248
[{:keys [db]}]
249249
{:fx [[:json-rpc/call
250-
[{:method "wakuext_finishPairingThroughSeedPhraseProcess"
250+
[{:method "wakuext_enableInstallationAndPair"
251251
:params [{:installationId (:syncing/installation-id db)}]
252252
:js-response true
253253
:on-success #(rf/dispatch [:sanitize-messages-and-process-response %])}]]]})

src/status_im/common/new_device_sheet/view.cljs

+28-29
Original file line numberDiff line numberDiff line change
@@ -45,32 +45,31 @@
4545
:button-one-props {:on-press #(pair-and-sync installation-id)}}]])
4646

4747
(defn installation-request-creator-view
48-
[]
49-
(let [installation-id (rf/sub [:profile/installation-id])]
50-
(rn/use-mount events-helper/dismiss-keyboard)
51-
[:<>
52-
[quo/text
53-
{:weight :semi-bold
54-
:size :heading-2
55-
:accessibility-label :new-device-sheet-heading
56-
:style style/heading}
57-
(i18n/label :t/pair-this-device-and-sync)]
58-
[quo/text
59-
{:weight :regular
60-
:size :paragraph-1
61-
:accessibility-label :new-device-sheet-message
62-
:style style/message}
63-
(i18n/label :t/new-device-detected-other-device-message)]
64-
[quo/text
65-
{:weight :semi-bold
66-
:size :heading-2
67-
:accessibility-label :new-device-installation-id
68-
:style style/heading}
69-
installation-id]
70-
[quo/bottom-actions
71-
{:actions :one-action
72-
:blur? true
73-
:container-style {:margin-top 12}
74-
:button-one-label (i18n/label :t/close)
75-
:button-one-props {:type :grey
76-
:on-press events-helper/hide-bottom-sheet}}]]))
48+
[installation-id]
49+
(rn/use-mount events-helper/dismiss-keyboard)
50+
[:<>
51+
[quo/text
52+
{:weight :semi-bold
53+
:size :heading-2
54+
:accessibility-label :new-device-sheet-heading
55+
:style style/heading}
56+
(i18n/label :t/pair-this-device-and-sync)]
57+
[quo/text
58+
{:weight :regular
59+
:size :paragraph-1
60+
:accessibility-label :new-device-sheet-message
61+
:style style/message}
62+
(i18n/label :t/new-device-detected-other-device-message)]
63+
[quo/text
64+
{:weight :semi-bold
65+
:size :heading-2
66+
:accessibility-label :new-device-installation-id
67+
:style style/heading}
68+
installation-id]
69+
[quo/bottom-actions
70+
{:actions :one-action
71+
:blur? true
72+
:container-style {:margin-top 12}
73+
:button-one-label (i18n/label :t/close)
74+
:button-one-props {:type :grey
75+
:on-press events-helper/hide-bottom-sheet}}]])

src/status_im/contexts/shell/activity_center/notification/syncing/view.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{:content
3131
(fn []
3232
[new-device-sheet/installation-request-creator-view
33-
(:id installationId)])}]))
33+
installationId])}]))
3434
[installationId])]
3535
[swipeable {:extra-fn extra-fn}
3636
[quo/activity-log
@@ -59,7 +59,7 @@
5959
{:content
6060
(fn []
6161
[new-device-sheet/installation-request-receiver-view
62-
(:id installationId)])}]))
62+
installationId])}]))
6363
[installationId])]
6464
[swipeable {:extra-fn extra-fn}
6565
[quo/activity-log

status-go-version.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"owner": "status-im",
55
"repo": "status-go",
66
"version": "feat/enable_sync_fallback",
7-
"commit-sha1": "ddc034270a5eb12938a7092e69811c043f417769",
8-
"src-sha256": "1i8j5ri839xizwc7v2h45bxpg80v4k2i437578r7y32m1ipw3rxk"
7+
"commit-sha1": "200389cc08230666dd853805c85a4051b2ba89ab",
8+
"src-sha256": "1gyqc9f1zrpy2cng6gjxzq5n286kw7j1lkc0n3zs38m8x0snj1a3"
99
}

0 commit comments

Comments
 (0)