Skip to content

Commit dbb19a2

Browse files
committedSep 14, 2023
chore: fix Issues 1,2 and 4
1 parent a0b433a commit dbb19a2

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed
 

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
[:<>
1919
[rn/view {:style style/header-row}
2020
[quo/button
21-
{icon-only? true
21+
{:icon-only? true
2222
:type :grey
2323
:background :blur
2424
:size 32
@@ -27,11 +27,11 @@
2727
:on-press #(rf/dispatch [:navigate-back])}
2828
:i/close]
2929
[quo/button
30-
{:icon true
31-
:type :blur-bg
30+
{:icon-only? true
31+
:type :grey
32+
:background :blur
3233
:size 32
3334
:accessibility-label :shell-scan-button
34-
:override-theme :dark
3535
:on-press #(rf/dispatch [:navigate-back])}
3636
:i/scan]]
3737
[quo/text

‎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)