Skip to content

Commit ac78dea

Browse files
fix: use blacklist for parallax (#18971)
1 parent b1f0d1c commit ac78dea

File tree

5 files changed

+30
-25
lines changed

5 files changed

+30
-25
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
(ns status-im.common.parallax.blacklist
2+
(:require
3+
[native-module.core :as native-module]))
4+
5+
(def ^:private device-id (:device-id (native-module/get-device-model-info)))
6+
7+
(defn- get-model-code
8+
[model]
9+
(if-let [[_ code] (and model (re-find #"iPhone(\d+)" model))]
10+
(js/parseInt code 10)
11+
0))
12+
13+
(def ^:private minimum-device-code 11)
14+
15+
(def blacklisted?
16+
(-> device-id
17+
get-model-code
18+
(< minimum-device-code)))

src/status_im/common/parallax/whitelist.cljs

-13
This file was deleted.

src/status_im/contexts/onboarding/enable_biometrics/view.cljs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[react-native.core :as rn]
55
[react-native.safe-area :as safe-area]
66
[status-im.common.biometric.events :as biometric]
7+
[status-im.common.parallax.blacklist :as blacklist]
78
[status-im.common.parallax.view :as parallax]
8-
[status-im.common.parallax.whitelist :as whitelist]
99
[status-im.common.resources :as resources]
1010
[status-im.contexts.onboarding.enable-biometrics.style :as style]
1111
[status-im.navigation.state :as state]
@@ -71,9 +71,9 @@
7171
(let [insets (safe-area/get-insets)]
7272
[rn/view {:style (style/page-container insets)}
7373
[page-title]
74-
(if whitelist/whitelisted?
75-
[enable-biometrics-parallax]
76-
[enable-biometrics-simple])
74+
(if blacklist/blacklisted?
75+
[enable-biometrics-simple]
76+
[enable-biometrics-parallax])
7777
[enable-biometrics-buttons insets]]))
7878

7979
(defn view

src/status_im/contexts/onboarding/enable_notifications/view.cljs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[react-native.core :as rn]
55
[react-native.platform :as platform]
66
[react-native.safe-area :as safe-area]
7+
[status-im.common.parallax.blacklist :as blacklist]
78
[status-im.common.parallax.view :as parallax]
8-
[status-im.common.parallax.whitelist :as whitelist]
99
[status-im.common.resources :as resources]
1010
[status-im.contexts.onboarding.enable-notifications.style :as style]
1111
[status-im.contexts.shell.jump-to.utils :as shell.utils]
@@ -78,9 +78,9 @@
7878
:icon-name :i/arrow-left
7979
:on-press #(rf/dispatch [:navigate-back-within-stack :enable-biometrics])}]
8080
[page-title]]
81-
(if whitelist/whitelisted?
82-
[enable-notifications-parallax]
83-
[enable-notifications-simple])
81+
(if blacklist/blacklisted?
82+
[enable-notifications-simple]
83+
[enable-notifications-parallax])
8484
[enable-notification-buttons {:insets insets}]]))
8585

8686
(defn view

src/status_im/contexts/onboarding/generating_keys/view.cljs

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[react-native.core :as rn]
55
[react-native.reanimated :as reanimated]
66
[react-native.safe-area :as safe-area]
7+
[status-im.common.parallax.blacklist :as blacklist]
78
[status-im.common.parallax.view :as parallax]
8-
[status-im.common.parallax.whitelist :as whitelist]
99
[status-im.common.resources :as resources]
1010
[status-im.contexts.onboarding.generating-keys.style :as style]
1111
[utils.i18n :as i18n]))
@@ -149,9 +149,9 @@
149149
[]
150150
(let [insets (safe-area/get-insets)]
151151
[rn/view {:style (style/page-container insets)}
152-
(if whitelist/whitelisted?
153-
[parallax-page insets]
154-
[:f> f-simple-page insets])]))
152+
(if blacklist/blacklisted?
153+
[:f> f-simple-page insets]
154+
[parallax-page insets])]))
155155

156156
(defn generating-keys
157157
[]

0 commit comments

Comments
 (0)