File tree 5 files changed +25
-24
lines changed
status_im2/contexts/shell/share
5 files changed +25
-24
lines changed Original file line number Diff line number Diff line change 5
5
(def screen-padding 20 )
6
6
7
7
(def blur
8
- {:position :absolute
9
- :top 0
10
- :left 0
11
- :right 0
12
- :bottom 0 })
8
+ {:position :absolute
9
+ :top 0
10
+ :left 0
11
+ :right 0
12
+ :bottom 0
13
+ :overlay-color colors/neutral-80-opa-80-blur})
13
14
14
15
(def header-row
15
16
{:flex-direction :row
19
20
20
21
(def header-button
21
22
{:margin-bottom 12
22
- :margin-left screen-padding
23
23
:background-color colors/white-opa-5})
24
24
25
25
(def header-heading
Original file line number Diff line number Diff line change 11
11
[utils.image-server :as image-server]
12
12
[react-native.navigation :as navigation]
13
13
[clojure.string :as string]
14
- [utils.address :as address]))
14
+ [utils.address :as address]
15
+ [react-native.platform :as platform]))
15
16
16
17
(defn header
17
18
[]
18
19
[:<>
19
20
[rn/view {:style style/header-row}
20
21
[quo/button
21
- {icon-only? true
22
+ {: icon-only? true
22
23
:type :grey
23
24
:background :blur
24
25
:size 32
27
28
:on-press #(rf/dispatch [:navigate-back ])}
28
29
:i/close ]
29
30
[quo/button
30
- {:icon true
31
- :type :blur-bg
31
+ {:icon-only? true
32
+ :type :grey
33
+ :background :blur
32
34
:size 32
33
35
:accessibility-label :shell-scan-button
34
- :override-theme :dark
35
36
:on-press #(rf/dispatch [:navigate-back ])}
36
37
:i/scan ]]
37
38
[quo/text
164
165
{:flex 1
165
166
:padding-top (navigation/status-bar-height )}
166
167
[blur/view
167
- {:style style/blur
168
- :background-color colors/neutral-80-opa-80-blur
169
- :blur-amount 20 }]
168
+ {:style style/blur
169
+ :blur-amount 20
170
+ :blur-radius ( if platform/android? 25 10 ) }]
170
171
[tab-content window-width]])))
Original file line number Diff line number Diff line change 21
21
of the compressed public key followed by an ellipsis followed by
22
22
the last 12 characters of the compressed public key"
23
23
[base-url public-key]
24
- (if (and public-key base-url (> (count public-key) 17 ) (= " join. status.im /u/" base-url))
24
+ (if (and public-key base-url (> (count public-key) 17 ) (= " status.app /u/" base-url))
25
25
(let [first-part-of-public-pk (subs public-key 0 5 )
26
26
ellipsis " ..."
27
27
public-key-size (count public-key)
Original file line number Diff line number Diff line change 21
21
22
22
(deftest test-get-abbreviated-profile-url
23
23
(testing " Ensure the function correctly generates an abbreviated profile URL for a valid public key"
24
- (is (= " join. status.im /u/zQ3sh...aimrdYpzeFUa"
24
+ (is (= " status.app /u/zQ3sh...aimrdYpzeFUa"
25
25
(utils.address/get-abbreviated-profile-url
26
- " join. status.im /u/"
26
+ " status.app /u/"
27
27
" zQ3shPrnUhhR42JJn3QdhodGest8w8MjiH8hPaimrdYpzeFUa" ))))
28
28
29
29
(testing " Ensure the function returns nil when given an empty public key"
30
- (is (nil? (utils.address/get-abbreviated-profile-url " join. status.im /u/" " " ))))
30
+ (is (nil? (utils.address/get-abbreviated-profile-url " status.app /u/" " " ))))
31
31
32
32
(testing " Ensure the function returns nil when given a nil public key"
33
- (is (nil? (utils.address/get-abbreviated-profile-url " join. status.im /u/" nil ))))
33
+ (is (nil? (utils.address/get-abbreviated-profile-url " status.app /u/" nil ))))
34
34
35
35
(testing " Ensure the function returns nil when given an incorrect base URL"
36
36
(is (nil? (utils.address/get-abbreviated-profile-url
37
- " join. status.im /uwu/"
37
+ " status.app /uwu/"
38
38
" zQ3shPrnUhhR42JJn3QdhodGest8w8MjiH8hPaimrdYpzeFUa" ))))
39
39
40
40
(testing " Ensure the function returns nil when given a public key shorter than 17 characters"
41
- (is (nil? (utils.address/get-abbreviated-profile-url " join. status.im /u/" " abc" )))
42
- (is (nil? (utils.address/get-abbreviated-profile-url " join. status.im /u/" " 1234" )))))
41
+ (is (nil? (utils.address/get-abbreviated-profile-url " status.app /u/" " abc" )))
42
+ (is (nil? (utils.address/get-abbreviated-profile-url " status.app /u/" " 1234" )))))
Original file line number Diff line number Diff line change 11
11
(def ^:const account-initials-action " /accountInitials" )
12
12
(def ^:const contact-images-action " /contactImages" )
13
13
(def ^:const generate-qr-action " /GenerateQRCode" )
14
- (def ^:const status-profile-base-url " https://join. status.im /u/" )
15
- (def ^:const status-profile-base-url-without-https " join. status.im /u/" )
14
+ (def ^:const status-profile-base-url " https://status.app /u/" )
15
+ (def ^:const status-profile-base-url-without-https " status.app /u/" )
16
16
17
17
(defn get-font-file-ready
18
18
" setup font file and get the absolute path to it
You can’t perform that action at this time.
0 commit comments