Skip to content

Commit e291be3

Browse files
committed
chore: fix issues 1,2,3 and 4
1 parent 0a8e654 commit e291be3

File tree

5 files changed

+25
-24
lines changed

5 files changed

+25
-24
lines changed

src/status_im2/contexts/shell/share/style.cljs

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
(def screen-padding 20)
66

77
(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})
1314

1415
(def header-row
1516
{:flex-direction :row
@@ -19,7 +20,6 @@
1920

2021
(def header-button
2122
{:margin-bottom 12
22-
:margin-left screen-padding
2323
:background-color colors/white-opa-5})
2424

2525
(def header-heading

src/status_im2/contexts/shell/share/view.cljs

+9-8
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111
[utils.image-server :as image-server]
1212
[react-native.navigation :as navigation]
1313
[clojure.string :as string]
14-
[utils.address :as address]))
14+
[utils.address :as address]
15+
[react-native.platform :as platform]))
1516

1617
(defn header
1718
[]
1819
[:<>
1920
[rn/view {:style style/header-row}
2021
[quo/button
21-
{icon-only? true
22+
{:icon-only? true
2223
:type :grey
2324
:background :blur
2425
:size 32
@@ -27,11 +28,11 @@
2728
:on-press #(rf/dispatch [:navigate-back])}
2829
:i/close]
2930
[quo/button
30-
{:icon true
31-
:type :blur-bg
31+
{:icon-only? true
32+
:type :grey
33+
:background :blur
3234
:size 32
3335
:accessibility-label :shell-scan-button
34-
:override-theme :dark
3536
:on-press #(rf/dispatch [:navigate-back])}
3637
:i/scan]]
3738
[quo/text
@@ -164,7 +165,7 @@
164165
{:flex 1
165166
:padding-top (navigation/status-bar-height)}
166167
[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)}]
170171
[tab-content window-width]])))

src/utils/address.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
of the compressed public key followed by an ellipsis followed by
2222
the last 12 characters of the compressed public key"
2323
[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))
2525
(let [first-part-of-public-pk (subs public-key 0 5)
2626
ellipsis "..."
2727
public-key-size (count public-key)

src/utils/address_test.cljs

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@
2121

2222
(deftest test-get-abbreviated-profile-url
2323
(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"
2525
(utils.address/get-abbreviated-profile-url
26-
"join.status.im/u/"
26+
"status.app/u/"
2727
"zQ3shPrnUhhR42JJn3QdhodGest8w8MjiH8hPaimrdYpzeFUa"))))
2828

2929
(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/" ""))))
3131

3232
(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))))
3434

3535
(testing "Ensure the function returns nil when given an incorrect base URL"
3636
(is (nil? (utils.address/get-abbreviated-profile-url
37-
"join.status.im/uwu/"
37+
"status.app/uwu/"
3838
"zQ3shPrnUhhR42JJn3QdhodGest8w8MjiH8hPaimrdYpzeFUa"))))
3939

4040
(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")))))

src/utils/image_server.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
(def ^:const account-initials-action "/accountInitials")
1212
(def ^:const contact-images-action "/contactImages")
1313
(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/")
1616

1717
(defn get-font-file-ready
1818
"setup font file and get the absolute path to it

0 commit comments

Comments
 (0)