Skip to content

Commit 24b0ef6

Browse files
committed
Rename utils.navigation to utils.user-actions and add docstring to clarify namespace use case
1 parent eecd1d5 commit 24b0ef6

File tree

8 files changed

+37
-35
lines changed

8 files changed

+37
-35
lines changed

Diff for: src/status_im/common/data_confirmation_sheet/view.cljs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
[react-native.core :as rn]
55
[status-im.common.data-confirmation-sheet.style :as style]
66
[utils.i18n :as i18n]
7-
[utils.navigation :as navigation]
8-
[utils.re-frame :as rf]))
7+
[utils.re-frame :as rf]
8+
[utils.user-actions :as user-actions]))
99

1010
(defn on-choice-callback
1111
[syncing-on-mobile-network?]
1212
(rf/dispatch [:network/set-syncing-on-mobile-network syncing-on-mobile-network?])
13-
(navigation/hide-bottom-sheet))
13+
(user-actions/hide-bottom-sheet))
1414

1515
(def on-wifi-only (partial on-choice-callback false))
1616
(def on-mobile-and-wifi (partial on-choice-callback true))
@@ -19,7 +19,7 @@
1919
[]
2020
(let [settings-drawer? (= (rf/sub [:view-id]) :screen/settings.syncing)
2121
syncing-on-mobile-network? (rf/sub [:profile/syncing-on-mobile-network?])]
22-
(rn/use-mount navigation/dismiss-keyboard)
22+
(rn/use-mount user-actions/dismiss-keyboard)
2323
[:<>
2424
[quo/text
2525
{:weight :semi-bold

Diff for: src/status_im/contexts/profile/settings/screens/messages/view.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
[quo.core :as quo]
44
[react-native.core :as rn]
55
[utils.i18n :as i18n]
6-
[utils.navigation :as navigation]
7-
[utils.re-frame :as rf]))
6+
[utils.re-frame :as rf]
7+
[utils.user-actions :as user-actions]))
88

99
(defn- open-blocked-users
1010
[]
@@ -21,7 +21,7 @@
2121
[quo/page-nav
2222
{:background :blur
2323
:icon-name :i/arrow-left
24-
:on-press navigation/navigate-back}]
24+
:on-press user-actions/navigate-back}]
2525
[quo/page-top {:title (i18n/label :t/messages)}]
2626
[quo/category
2727
{:label (i18n/label :t/contacts)

Diff for: src/status_im/contexts/profile/settings/screens/syncing/view.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
[quo.core :as quo]
44
[status-im.common.data-confirmation-sheet.view :as data-confirmation-sheet]
55
[utils.i18n :as i18n]
6-
[utils.navigation :as navigation]
7-
[utils.re-frame :as rf]))
6+
[utils.re-frame :as rf]
7+
[utils.user-actions :as user-actions]))
88

99
(defn- open-paired-devices-list
1010
[]
@@ -26,7 +26,7 @@
2626
[quo/page-nav
2727
{:background :blur
2828
:icon-name :i/arrow-left
29-
:on-press navigation/navigate-back}]
29+
:on-press user-actions/navigate-back}]
3030
[quo/page-top {:title (i18n/label :t/syncing)}]
3131
[quo/category
3232
{:data [{:title (i18n/label :t/sync-and-backup)

Diff for: src/status_im/contexts/settings/privacy_and_security/view.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
[status-im.contexts.settings.privacy-and-security.style :as style]
1010
[status-im.feature-flags :as ff]
1111
[utils.i18n :as i18n]
12-
[utils.navigation :as navigation]
13-
[utils.re-frame :as rf]))
12+
[utils.re-frame :as rf]
13+
[utils.user-actions :as user-actions]))
1414

1515
(defn- setting-preview-privacy
1616
[preview-privacy? customization-color on-change]
@@ -68,7 +68,7 @@
6868
{:key :header
6969
:background :blur
7070
:icon-name :i/arrow-left
71-
:on-press navigation/navigate-back}]
71+
:on-press user-actions/navigate-back}]
7272
[quo/standard-title
7373
{:title (i18n/label :t/privacy-and-security)
7474
:container-style style/title-container

Diff for: src/status_im/contexts/wallet/swap/set_spending_cap/view.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
[status-im.contexts.wallet.swap.set-spending-cap.style :as style]
1111
[utils.address :as address-utils]
1212
[utils.i18n :as i18n]
13-
[utils.navigation :as navigation]
14-
[utils.re-frame :as rf]))
13+
[utils.re-frame :as rf]
14+
[utils.user-actions :as user-actions]))
1515

1616
(defn- swap-title
1717
[{:keys [pay-token-symbol pay-amount account provider]}]
@@ -209,7 +209,7 @@
209209
{:footer-container-padding 0
210210
:header [quo/page-nav
211211
{:icon-name :i/close
212-
:on-press navigation/navigate-back
212+
:on-press user-actions/navigate-back
213213
:margin-top 8
214214
:background :blur
215215
:accessibility-label :top-bar}]

Diff for: src/status_im/contexts/wallet/swap/setup_swap/view.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
[status-im.contexts.wallet.common.utils :as utils]
77
[status-im.contexts.wallet.swap.setup-swap.style :as style]
88
[utils.i18n :as i18n]
9-
[utils.navigation :as navigation]
10-
[utils.re-frame :as rf]))
9+
[utils.re-frame :as rf]
10+
[utils.user-actions :as user-actions]))
1111

1212
(defn- data-item
1313
[{:keys [title subtitle size subtitle-icon loading?]}]
@@ -65,7 +65,7 @@
6565
(set-pay-value #(subs % 0 (dec (count %)))))]
6666
[rn/view {:style style/container}
6767
[account-switcher/view
68-
{:on-press navigation/navigate-back
68+
{:on-press user-actions/navigate-back
6969
:icon-name :i/arrow-left
7070
:margin-top (safe-area/get-top)
7171
:switcher-type :select-account}]

Diff for: src/utils/navigation.cljs

-16
This file was deleted.

Diff for: src/utils/user_actions.cljs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
(ns utils.user-actions
2+
"Provides a collection of highly reusable dispatch functions for user actions, including
3+
navigation and other user-driven events. This namespace focuses on actions that directly
4+
impact user interaction with the application, ensuring consistency and efficiency in handling
5+
these interactions."
6+
(:require [utils.re-frame :as rf]))
7+
8+
(defn navigate-back
9+
[]
10+
(rf/dispatch [:navigate-back]))
11+
12+
(defn hide-bottom-sheet
13+
[]
14+
(rf/dispatch [:hide-bottom-sheet]))
15+
16+
(defn dismiss-keyboard
17+
[]
18+
(rf/dispatch [:dismiss-keyboard]))

0 commit comments

Comments
 (0)