fix: Unable to add new contact on receiver device after local pairing until app relaunch (#14936)
This commit is contained in:
parent
e4722e05f3
commit
0472140f02
|
@ -54,9 +54,9 @@
|
||||||
:peers-count (count (:peers peer-stats)))}))
|
:peers-count (count (:peers peer-stats)))}))
|
||||||
|
|
||||||
(defn handle-local-pairing-signals
|
(defn handle-local-pairing-signals
|
||||||
[signal-type]
|
[event]
|
||||||
(log/info "local pairing signal received"
|
(log/debug "local pairing signal received"
|
||||||
{:signal-type signal-type}))
|
{:event event}))
|
||||||
|
|
||||||
(rf/defn process
|
(rf/defn process
|
||||||
{:events [:signals/signal-received]}
|
{:events [:signals/signal-received]}
|
||||||
|
@ -110,5 +110,5 @@
|
||||||
"status.updates.timedout" (visibility-status-updates/handle-visibility-status-updates
|
"status.updates.timedout" (visibility-status-updates/handle-visibility-status-updates
|
||||||
cofx
|
cofx
|
||||||
(js->clj event-js :keywordize-keys true))
|
(js->clj event-js :keywordize-keys true))
|
||||||
"localPairing" (handle-local-pairing-signals event-str)
|
"localPairing" (handle-local-pairing-signals (js->clj event-js :keywordize-keys true))
|
||||||
(log/debug "Event " type " not handled"))))
|
(log/debug "Event " type " not handled"))))
|
||||||
|
|
|
@ -273,3 +273,9 @@
|
||||||
(def ^:const theme-type-light 1)
|
(def ^:const theme-type-light 1)
|
||||||
(def ^:const theme-type-dark 2)
|
(def ^:const theme-type-dark 2)
|
||||||
(def ^:const bottom-sheet-animation-delay 450)
|
(def ^:const bottom-sheet-animation-delay 450)
|
||||||
|
|
||||||
|
(def ^:const local-pair-event-process-success "process-success")
|
||||||
|
(def ^:const local-pair-event-process-error "process-error")
|
||||||
|
(def ^:const local-pair-action-connect 1)
|
||||||
|
(def ^:const local-pair-action-pairing-account 2)
|
||||||
|
(def ^:const local-pair-action-sync-device 3)
|
||||||
|
|
|
@ -25,7 +25,10 @@
|
||||||
|
|
||||||
(defn dismiss-all-modals
|
(defn dismiss-all-modals
|
||||||
[]
|
[]
|
||||||
(log/debug "dissmiss-all-modals")
|
(log/debug "dissmiss-all-modals"
|
||||||
|
{:curr-modal @state/curr-modal
|
||||||
|
:modals @state/modals
|
||||||
|
:dissmissing @state/dissmissing})
|
||||||
(when @state/curr-modal
|
(when @state/curr-modal
|
||||||
(reset! state/curr-modal false)
|
(reset! state/curr-modal false)
|
||||||
(reset! state/dissmissing true)
|
(reset! state/dissmissing true)
|
||||||
|
@ -75,7 +78,11 @@
|
||||||
|
|
||||||
(defn open-modal
|
(defn open-modal
|
||||||
[comp]
|
[comp]
|
||||||
(log/debug "open-modal" comp)
|
(log/debug "open-modal"
|
||||||
|
{:comp comp
|
||||||
|
:dissmissing @state/dissmissing
|
||||||
|
:curr-modal @state/curr-modal
|
||||||
|
:modals @state/modals})
|
||||||
(let [{:keys [options]} (get views/screens comp)]
|
(let [{:keys [options]} (get views/screens comp)]
|
||||||
(if @state/dissmissing
|
(if @state/dissmissing
|
||||||
(reset! state/dissmissing comp)
|
(reset! state/dissmissing comp)
|
||||||
|
@ -122,6 +129,10 @@
|
||||||
|
|
||||||
(defn modal-dismissed-listener
|
(defn modal-dismissed-listener
|
||||||
[]
|
[]
|
||||||
|
(log/debug "modal-dismissed"
|
||||||
|
{:modals @state/modals
|
||||||
|
:curr-modal @state/curr-modal
|
||||||
|
:dissmissing @state/dissmissing})
|
||||||
(if (> (count @state/modals) 1)
|
(if (> (count @state/modals) 1)
|
||||||
(let [new-modals (butlast @state/modals)]
|
(let [new-modals (butlast @state/modals)]
|
||||||
(reset! state/modals (vec new-modals))
|
(reset! state/modals (vec new-modals))
|
||||||
|
@ -180,6 +191,7 @@
|
||||||
:init-root-fx
|
:init-root-fx
|
||||||
(fn [new-root-id]
|
(fn [new-root-id]
|
||||||
(log/debug :init-root-fx new-root-id)
|
(log/debug :init-root-fx new-root-id)
|
||||||
|
(dismiss-all-modals)
|
||||||
(reset! state/root-comp-id new-root-id)
|
(reset! state/root-comp-id new-root-id)
|
||||||
(reset! state/root-id @state/root-comp-id)
|
(reset! state/root-id @state/root-comp-id)
|
||||||
(navigation/set-root (get (roots/roots) new-root-id))))
|
(navigation/set-root (get (roots/roots) new-root-id))))
|
||||||
|
@ -188,6 +200,7 @@
|
||||||
:init-root-with-component-fx
|
:init-root-with-component-fx
|
||||||
(fn [[new-root-id new-root-comp-id]]
|
(fn [[new-root-id new-root-comp-id]]
|
||||||
(log/debug :init-root-with-component-fx new-root-id new-root-comp-id)
|
(log/debug :init-root-with-component-fx new-root-id new-root-comp-id)
|
||||||
|
(dismiss-all-modals)
|
||||||
(reset! state/root-comp-id new-root-comp-id)
|
(reset! state/root-comp-id new-root-comp-id)
|
||||||
(reset! state/root-id @state/root-comp-id)
|
(reset! state/root-id @state/root-comp-id)
|
||||||
(navigation/set-root (get (roots/roots) new-root-id))))
|
(navigation/set-root (get (roots/roots) new-root-id))))
|
||||||
|
|
Loading…
Reference in New Issue