Skip to content

Commit 5bb954f

Browse files
authored
[#17351] remove status-im.utils.platform (#17352)
1 parent 6a169bd commit 5bb954f

File tree

30 files changed

+33
-87
lines changed

30 files changed

+33
-87
lines changed

.carve_ignore

-4
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,6 @@ status-im.desktop.core/init
196196
status-im.chat.models-test/test-db
197197
quo.design-system.spacing/padding-vertical
198198
status-im.utils.money/percent-change
199-
status-im.utils.platform/isMacOs?
200-
status-im.utils.platform/isNix?
201-
status-im.utils.platform/isWin?
202-
status-im.utils.platform/android-version>=
203199
utils.debounce/clear-all
204200
status-im.transport.db/create-chat
205201
status-im.utils.priority-map/priority-map

src/status_im/browser/core.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[status-im.ui.components.list-selection :as list-selection]
1919
[utils.re-frame :as rf]
2020
[utils.url :as url]
21-
[status-im.utils.platform :as platform]
21+
[react-native.platform :as platform]
2222
[status-im.utils.random :as random]
2323
[status-im.utils.types :as types]
2424
[status-im.utils.universal-links.utils :as links]

src/status_im/chat/models/images.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[react-native.fs :as fs]
88
[status-im2.constants :as constants]
99
[utils.re-frame :as rf]
10-
[status-im.utils.platform :as platform]
10+
[react-native.platform :as platform]
1111
[taoensso.timbre :as log]))
1212

1313
(def temp-image-url (str (fs/cache-dir) "/StatusIm_Image.jpeg"))

src/status_im/chat/models/message.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[status-im.chat.models.loading :as chat.loading]
55
[status-im.data-store.messages :as data-store.messages]
66
[status-im.transport.message.protocol :as protocol]
7-
[status-im.utils.platform :as platform]
7+
[react-native.platform :as platform]
88
[status-im.utils.types :as types]
99
[status-im2.contexts.chat.messages.delete-message.events :as delete-message]
1010
[status-im2.contexts.chat.messages.list.events :as message-list]

src/status_im/keycard/common.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[utils.re-frame :as rf]
1111
[utils.datetime :as datetime]
1212
[status-im.utils.keychain.core :as keychain]
13-
[status-im.utils.platform :as platform]
13+
[react-native.platform :as platform]
1414
[status-im.utils.types :as types]
1515
[status-im2.navigation.events :as navigation]
1616
[taoensso.timbre :as log]))

src/status_im/keycard/real_keycard.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[status-im.ethereum.core :as ethereum]
66
[status-im.keycard.keycard :as keycard]
77
[native-module.core :as native-module]
8-
[status-im.utils.platform :as platform]
8+
[react-native.platform :as platform]
99
[status-im.utils.types :as types]
1010
[taoensso.timbre :as log]))
1111

src/status_im/keycard/recovery.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
[utils.re-frame :as rf]
1616
[utils.datetime :as datetime]
1717
[status-im.utils.keychain.core :as keychain]
18-
[status-im.utils.platform :as platform]
18+
[react-native.platform :as platform]
1919
[status-im.utils.types :as types]
2020
[status-im2.navigation.events :as navigation]
2121
[taoensso.timbre :as log]

src/status_im/multiaccounts/login/core.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[native-module.core :as native-module]
66
[status-im.ui.components.react :as react]
77
[utils.re-frame :as rf]
8-
[status-im.utils.platform :as platform]
8+
[react-native.platform :as platform]
99
[status-im.utils.types :as types]
1010
[utils.security.core :as security]))
1111

src/status_im/node/core.cljs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
[native-module.core :as native-module]
44
[status-im2.config :as config]
55
[utils.re-frame :as rf]
6-
[status-im.utils.platform :as utils.platform]
76
[status-im.utils.types :as types]
8-
[clojure.string :as string]))
7+
[clojure.string :as string]
8+
[react-native.platform :as platform]))
99

1010
(defn- add-custom-bootnodes
1111
[config network all-bootnodes]
@@ -173,7 +173,7 @@
173173
:WakuV2Config (merge (assoc wakuv2-config :Enabled wakuv2-enabled)
174174
wakuv2-default-config)
175175
:ShhextConfig
176-
{:BackupDisabledDataDir (utils.platform/no-backup-directory)
176+
{:BackupDisabledDataDir (if platform/android? "/../no_backup" "/")
177177
:InstallationID installation-id
178178
:MaxMessageDeliveryAttempts config/max-message-delivery-attempts
179179
:MailServerConfirmations config/mailserver-confirmations-enabled?
@@ -205,7 +205,7 @@
205205
which will take care of building up the proper config based on settings in
206206
app-db"
207207
{:events [::save-new-config]}
208-
[{:keys [db]} config {:keys [on-success]}]
208+
[_ config {:keys [on-success]}]
209209
{:json-rpc/call [{:method "settings_saveSetting"
210210
:params [:node-config config]
211211
:on-success on-success}]})

src/status_im/pairing/core.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[status-im.multiaccounts.update.core :as multiaccounts.update]
55
[status-im2.config :as config]
66
[utils.re-frame :as rf]
7-
[status-im.utils.platform :as utils.platform]
7+
[react-native.platform :as utils.platform]
88
[status-im2.common.json-rpc.events :as json-rpc]
99
[status-im2.navigation.events :as navigation]
1010
[taoensso.timbre :as log]))

src/status_im/ui/components/bottom_panel/views.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[reagent.core :as reagent]
55
[status-im.ui.components.animation :as anim]
66
[status-im.ui.components.react :as react]
7-
[status-im.utils.platform :as platform])
7+
[react-native.platform :as platform])
88
(:require-macros [status-im.utils.views :as views]))
99

1010
(def back-listener (atom nil))

src/status_im/ui/components/emoji_thumbnail/styles.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(ns status-im.ui.components.emoji-thumbnail.styles
22
(:require [quo.design-system.colors :as colors]
33
[status-im.ui.components.emoji-thumbnail.utils :as emoji-utils]
4-
[status-im.utils.platform :as platform]))
4+
[react-native.platform :as platform]))
55

66
(defn emoji-thumbnail-icon
77
[color size]

src/status_im/ui/components/emoji_thumbnail/utils.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns status-im.ui.components.emoji-thumbnail.utils
2-
(:require [status-im.utils.platform :as platform]))
2+
(:require [react-native.platform :as platform]))
33

44
(defn emoji-font-size
55
[container_size]

src/status_im/ui/components/list/views.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[reagent.core :as reagent]
44
[status-im.ui.components.list.styles :as styles]
55
[status-im.ui.components.react :as react]
6-
[status-im.utils.platform :as platform]))
6+
[react-native.platform :as platform]))
77

88
(def flat-list-class (reagent/adapt-react-class (.-FlatList react-native)))
99
(def section-list-class (reagent/adapt-react-class (.-SectionList react-native)))

src/status_im/ui/components/list_selection.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[status-im.ui.components.dialog :as dialog]
66
[status-im.ui.components.react :as react]
77
[utils.url :as url]
8-
[status-im.utils.platform :as platform]))
8+
[react-native.platform :as platform]))
99

1010
(defn open-share
1111
[content]

src/status_im/ui/components/react.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[reagent.core :as reagent]
1313
[utils.i18n :as i18n]
1414
[status-im.ui.components.typography :as typography]
15-
[status-im.utils.platform :as platform]
15+
[react-native.platform :as platform]
1616
[status-im.utils.utils :as utils])
1717
(:require-macros [status-im.utils.views :as views]))
1818

src/status_im/ui/components/tabbar/core.cljs

-10
This file was deleted.

src/status_im/ui/components/webview.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
(:require ["react-native-webview" :default rn-webview]
33
[reagent.core :as reagent]
44
[status-im2.config :as config]
5-
[status-im.utils.platform :as platform]))
5+
[react-native.platform :as platform]))
66

77
(def webview-class
88
(reagent/adapt-react-class rn-webview))

src/status_im/ui/screens/chat/group.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[status-im2.constants :as constants]
66
[utils.i18n :as i18n]
77
[status-im.ui.components.react :as react]
8-
[status-im.utils.platform :as platform]
8+
[react-native.platform :as platform]
99
[utils.debounce :as debounce])
1010
(:require-macros [status-im.utils.views :refer [defview letsubs]]))
1111

src/status_im/ui/screens/keycard/pin/views.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[status-im.ui.components.icons.icons :as icons]
1010
[status-im.ui.components.react :as react]
1111
[status-im.ui.screens.keycard.pin.styles :as styles]
12-
[status-im.utils.platform :as platform]))
12+
[react-native.platform :as platform]))
1313

1414
(def default-pin-retries-number 3)
1515
(def default-puk-retries-number 5)

src/status_im/ui/screens/popover/views.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[status-im.ui.screens.signing.views :as signing]
1515
[status-im.ui.screens.wallet.request.views :as request]
1616
[status-im.ui.screens.wallet.signing-phrase.views :as signing-phrase]
17-
[status-im.utils.platform :as platform]))
17+
[react-native.platform :as platform]))
1818

1919
(defn hide-panel-anim
2020
[bottom-anim-value alpha-value window-height]

src/status_im/ui/screens/privacy_and_security_settings/views.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[status-im.ui.components.common.common :as components.common]
99
[status-im.ui.components.react :as react]
1010
[status-im2.config :as config]
11-
[status-im.utils.platform :as platform])
11+
[react-native.platform :as platform])
1212
(:require-macros [status-im.utils.views :as views]))
1313

1414
(defn separator

src/status_im/ui/screens/profile/visibility_status/views.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[status-im.ui.screens.profile.visibility-status.styles :as styles]
1313
[status-im.ui.screens.profile.visibility-status.utils :as utils]
1414
[utils.re-frame :as rf]
15-
[status-im.utils.platform :as platform]))
15+
[react-native.platform :as platform]))
1616

1717
;; === Code Related to visibility-status-button ===
1818

src/status_im/ui/screens/signing/views.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
[status-im.ui.screens.signing.sheets :as sheets]
2323
[status-im.ui.screens.signing.styles :as styles]
2424
[status-im.ui.screens.wallet.components.views :as wallet.components]
25-
[status-im.utils.platform :as platform]
25+
[react-native.platform :as platform]
2626
[status-im.utils.types :as types]
2727
[status-im.utils.utils :as utils]
2828
[status-im.wallet.utils :as wallet.utils]

src/status_im/utils/logging/core.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[status-im.utils.build :as build]
1212
[utils.re-frame :as rf]
1313
[utils.datetime :as datetime]
14-
[status-im.utils.platform :as platform]
14+
[react-native.platform :as platform]
1515
[status-im.utils.types :as types]
1616
[status-im2.common.log :as log]
1717
[status-im2.config :as config]))

src/status_im/utils/platform.cljs

-40
This file was deleted.

src/status_im/utils/styles.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[style]
55
`(let [style# ~style
66
common# (dissoc style# :android :ios)
7-
platform# (keyword status-im.utils.platform/os)
7+
platform# (keyword react-native.platform/os)
88
platform-specific# (get style# platform#)]
99
(if platform-specific#
1010
(merge common# platform-specific#)

src/status_im/utils/styles.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
(ns status-im.utils.styles
22
(:require-macros status-im.utils.styles)
3-
(:require status-im.utils.platform))
3+
(:require react-native.platform))

src/status_im2/common/bottom_sheet/style.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(ns status-im2.common.bottom-sheet.style
22
(:require [quo2.foundations.colors :as colors]
33
[quo2.theme :as theme]
4-
[status-im.utils.platform :as platform]))
4+
[react-native.platform :as platform]))
55

66
(defn handle
77
[theme]

src/status_im2/contexts/syncing/events.cljs

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
[re-frame.core :as re-frame]
44
[status-im.data-store.settings :as data-store.settings]
55
[status-im.node.core :as node]
6-
[status-im.utils.platform :as utils.platform]
76
[status-im2.config :as config]
87
[status-im2.constants :as constants]
98
[taoensso.timbre :as log]
109
[utils.re-frame :as rf]
1110
[utils.security.core :as security]
12-
[utils.transforms :as transforms]))
11+
[utils.transforms :as transforms]
12+
[react-native.platform :as platform]))
1313

1414
(rf/defn local-pairing-update-role
1515
{:events [:syncing/update-role]}
@@ -60,7 +60,7 @@
6060
{:receiverConfig {:kdfIterations config/default-kdf-iterations
6161
:nodeConfig final-node-config
6262
:settingCurrentNetwork config/default-network
63-
:deviceType utils.platform/os
63+
:deviceType platform/os
6464
:deviceName
6565
(native-module/get-installation-name)}}))]
6666
(rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver])
@@ -87,7 +87,7 @@
8787
(clj->js {:senderConfig {:keyUID key-uid
8888
:keystorePath ""
8989
:password sha3-pwd
90-
:deviceType utils.platform/os}
90+
:deviceType platform/os}
9191
:serverConfig {:timeout 0}}))]
9292
(native-module/get-connection-string-for-bootstrapping-another-device
9393
config-map

0 commit comments

Comments
 (0)