Merge branch 'develop' into fix/reject-on-drag

feat: reject session request on modal dragged
fix: don't dismiss modal by id if not open
2024-07-17 15:45:11 +03:00 · 2024-07-17 11:13:10 +03:00 · 2024-07-16 17:08:02 +03:00
4 changed files with 14 additions and 6 deletions
@@ -19,6 +19,7 @@
        network               (rf/sub [:wallet-connect/current-request-network])
        {:keys [max-fees-fiat-formatted
                error-state]} (rf/sub [:wallet-connect/current-request-transaction-information])]
+    (rn/use-unmount #(rf/dispatch [:wallet-connect/reject-session-request]))
    [rn/view {:style (style/container bottom)}
     [quo/gradient-cover {:customization-color customization-color}]
     [page-nav/view
@@ -10,9 +10,10 @@
 (rf/reg-event-fx
 :wallet-connect/process-session-request
 (fn [{:keys [db]} [event]]
-   (let [method (wallet-connect-core/get-request-method event)
-         screen (wallet-connect-core/method-to-screen method)]
-     (if screen
+   (let [method                (wallet-connect-core/get-request-method event)
+         screen                (wallet-connect-core/method-to-screen method)
+         current-request-event (get-in db [:wallet-connect/current-request :event])]
+     (if (and screen (not current-request-event))
       {:db (assoc-in db [:wallet-connect/current-request :event] event)
        :fx [(condp = method
               constants/wallet-connect-eth-send-transaction-method
@@ -122,9 +122,11 @@
 (defn dismiss-modal
  ([] (dismiss-modal nil))
  ([comp-id]
-   (reset! state/dissmissing true)
-   (navigation/dismiss-modal (name (or comp-id (last @state/modals))))
-   (state/navigation-pop-from comp-id)))
+   (when (or (not comp-id)
+             (state/modal-open? comp-id))
+     (reset! state/dissmissing true)
+     (navigation/dismiss-modal (name (or comp-id (last @state/modals))))
+     (state/navigation-pop-from comp-id))))

 (defn navigate-back
  []
@@ -49,3 +49,7 @@
  [comp-id]
  (when-let [index (first (indices-of-predicate-match #(= comp-id (:id %)) @navigation-state))]
    (navigation-state-reset (vec (take (inc index) @navigation-state)))))
+
+(defn modal-open?
+  [comp-id]
+  (contains? (set @modals) comp-id))
Author	SHA1	Message	Date
Lungu Cristian	0d89b78fa4	Merge branch 'develop' into fix/reject-on-drag	2024-07-17 15:45:11 +03:00
Lungu Cristian	260d4bcba2	feat: reject session request on modal dragged	2024-07-17 11:13:10 +03:00
Lungu Cristian	70b6104b5d	fix: don't dismiss modal by id if not open	2024-07-16 17:08:02 +03:00