status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#19182] fix: shell share design feedback (#19617) 

Co-authored-by: Yevheniia Berdnyk <ie.berdnyk@gmail.com>
This commit is contained in:
Mohsen 2024-04-18 18:12:29 +03:00 committed by GitHub
parent ea4578b3e0
commit 8f67f38de9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/quo/components/share/share_qr_code/view.cljs
View File

@ -22,16 +22,6 @@
(defn- header
[{:keys [on-legacy-press on-multichain-press address]}]
[rn/view {:style style/header-container}
[tab/view
{:accessibility-label :share-qr-code-legacy-tab
:id :wallet-legacy-tab
:active-item-container-style style/header-tab-active
:item-container-style style/header-tab-inactive
:size 24
:active (= :legacy address)
:on-press on-legacy-press}
(i18n/label :t/legacy)]
[rn/view {:style style/space-between-tabs}]
[tab/view
{:accessibility-label :share-qr-code-multichain-tab
:id :wallet-multichain-tab
@ -40,7 +30,17 @@
:size 24
:active (= :multichain address)
:on-press on-multichain-press}
(i18n/label :t/multichain)]])
(i18n/label :t/multichain)]
[rn/view {:style style/space-between-tabs}]
[tab/view
{:accessibility-label :share-qr-code-legacy-tab
:id :wallet-legacy-tab
:active-item-container-style style/header-tab-active
:item-container-style style/header-tab-inactive
:size 24
:active (= :legacy address)
:on-press on-legacy-press}
(i18n/label :t/legacy)]])
(defn- info-label
[share-qr-code-type]

3
src/status_im/contexts/shell/share/style.cljs
View File

@ -84,7 +84,8 @@
(def tabs-container
{:padding-horizontal screen-padding
:margin-vertical 8})
:margin-top 8
:margin-bottom 16})
(def wip-style
{:color colors/white

7
src/status_im/contexts/shell/share/wallet/component_spec.cljs
View File

@ -11,7 +11,8 @@
share-qr-code (h/get-by-label-text :share-qr-code)]
;; Fires on-layout since it's needed to render the content
(h/fire-event :layout share-qr-code #js {:nativeEvent #js {:layout #js {:width 500}}})
(rerender-fn [wallet-view/wallet-tab])))
(rerender-fn [wallet-view/wallet-tab])
(h/fire-event :press (h/get-by-label-text :share-qr-code-legacy-tab))))
(h/describe "share wallet addresses"
(h/setup-restorable-re-frame)
@ -26,8 +27,8 @@
(h/test "should display the wallet tab"
(render-wallet-view)
(-> (h/wait-for #(h/get-by-text "Wallet One"))
(.then (fn [] (h/is-truthy (h/get-by-text "Wallet One"))))))
(-> (h/expect (h/query-by-text "Wallet One"))
(h/is-truthy)))
(h/test "should display the legacy account"
(render-wallet-view)

2
src/status_im/contexts/shell/share/wallet/view.cljs
View File

@ -53,7 +53,7 @@
[{:keys [account index]}]
(let [{window-width :width} (rn/get-window)
selected-networks (reagent/atom constants/default-network-names)
wallet-type (reagent/atom :legacy)
wallet-type (reagent/atom :multichain)
on-settings-press #(open-preferences selected-networks account)
on-legacy-press #(reset! wallet-type :legacy)
on-multichain-press #(reset! wallet-type :multichain)]

20
test/appium/tests/critical/test_wallet.py
View File

@ -154,7 +154,7 @@ class TestWalletOneDevice(MultipleSharedDeviceTestCase):
self.wallet_view.click_system_back_button()
self.wallet_view.close_account_button.click_until_presence_of_element(self.home_view.show_qr_code_button)
self.wallet_view.just_fyi("Checking that the new wallet is added to the Sare QR Code menu")
self.wallet_view.just_fyi("Checking that the new wallet is added to the Share QR Code menu")
self.home_view.show_qr_code_button.click()
self.home_view.share_wallet_tab_button.click()
if self.home_view.account_name_text.text != 'Account 1':
@ -162,10 +162,14 @@ class TestWalletOneDevice(MultipleSharedDeviceTestCase):
self.home_view.qr_code_image_element.swipe_left_on_element()
try:
self.home_view.account_name_text.wait_for_element_text(text=new_account_name, wait_time=3)
if self.home_view.copy_wallet_address() != new_wallet_address.split(':')[-1]:
self.home_view.driver.fail("Incorrect address")
except Failed:
self.errors.append("Can't swipe between accounts, newly added account is not shown")
else:
shown_address = self.home_view.copy_wallet_address()
if set(shown_address.split(':')) != set(new_wallet_address.split(':')):
self.errors.append(
"Incorrect address '%s' is shown when swiping between accounts, expected one is '%s'" % (
shown_address, new_wallet_address))
self.home_view.click_system_back_button()
self.wallet_view.just_fyi("Removing newly added account")
@ -189,7 +193,7 @@ class TestWalletOneDevice(MultipleSharedDeviceTestCase):
pytest.fail("Account to watch was not added")
self.wallet_view.close_account_button.click_until_presence_of_element(self.home_view.show_qr_code_button)
self.wallet_view.just_fyi("Checking that the new wallet is added to the Sare QR Code menu")
self.wallet_view.just_fyi("Checking that the new wallet is added to the Share QR Code menu")
self.home_view.show_qr_code_button.click()
self.home_view.share_wallet_tab_button.click()
if self.home_view.account_name_text.text != 'Account 1':
@ -197,10 +201,14 @@ class TestWalletOneDevice(MultipleSharedDeviceTestCase):
self.home_view.qr_code_image_element.swipe_left_on_element()
try:
self.home_view.account_name_text.wait_for_element_text(text=new_account_name, wait_time=3)
if self.home_view.copy_wallet_address() != address_to_watch:
self.home_view.driver.fail("Incorrect address")
except Failed:
self.errors.append("Can't swipe between accounts, account to watch is not shown")
else:
shown_address = self.home_view.copy_wallet_address()
if set(shown_address.split(':')) != {'eth', 'arb1', 'opt', address_to_watch}:
self.home_view.driver.fail(
"Incorrect address '%s' is shown when swiping between accounts, expected one is '%s'" % (
shown_address, ':'.join(address_to_watch)))
self.home_view.click_system_back_button()
self.wallet_view.just_fyi("Removing account to watch")