Compare commits

..
5 changed files with 17 additions and 18 deletions
+2 -1
View File
@@ -275,7 +275,8 @@
{:events [:chat/unmute-chat-community]}
[{:keys [db]} chat-id]
(let [{:keys [community-id]} (get-in db [:chats chat-id])]
{:db (assoc-in db [:communities community-id :muted] false)}))
(when community-id
{:db (assoc-in db [:communities community-id :muted] false)})))
(rf/defn mute-chat-failed
{:events [:chat/mute-failed]}
@@ -36,7 +36,7 @@
{:db (assoc-in db [:keycard :change-pin :new-pin] (security/mask-data pin))}))
(defn- change-pin-and-continue
[change-pin-data]
[current-pin new-pin]
(rf/dispatch [:keycard/change-pin
{:on-success (fn []
(rf/dispatch [:navigate-back])
@@ -46,18 +46,15 @@
(rf/dispatch [:navigate-back])
(rf/dispatch [:keycard/disconnect])
(rf/dispatch [:open-modal :screen/keycard.pin-change-failed]))
:current-pin (security/safe-unmask-data (:current-pin change-pin-data))
:new-pin (security/safe-unmask-data (:new-pin change-pin-data))}]))
:current-pin current-pin
:new-pin new-pin}]))
(defn- verify-pin-and-continue
[change-pin-data]
[current-pin new-pin]
(rf/dispatch
[:keycard/verify-pin
{:pin (security/safe-unmask-data (:current-pin change-pin-data))
:on-success (fn []
(rf/dispatch [:keycard/connect.next-stage
{:key-uid (:key-uid change-pin-data)
:on-success #(change-pin-and-continue change-pin-data)}]))
{:pin current-pin
:on-success #(change-pin-and-continue current-pin new-pin)
:on-failure (fn [error]
(when-not (utils/tag-lost? (:error error))
(rf/dispatch [:keycard/disconnect])
@@ -66,10 +63,11 @@
(rf/reg-event-fx :keycard/change-pin.verify-current-pin-and-continue
(fn [{:keys [db]}]
(let [key-uid (get-in db [:profile/profile :key-uid])
change-pin-data (assoc (get-in db [:keycard :change-pin]) :key-uid key-uid)]
(let [{:keys [current-pin new-pin]} (get-in db [:keycard :change-pin])
unmasked-current-pin (security/safe-unmask-data current-pin)
unmasked-new-pin (security/safe-unmask-data new-pin)]
{:fx [[:dispatch
[:keycard/connect
{:theme :dark
:key-uid key-uid
:on-success #(verify-pin-and-continue change-pin-data)}]]]})))
:key-uid (get-in db [:profile/profile :key-uid])
:on-success #(verify-pin-and-continue unmasked-current-pin unmasked-new-pin)}]]]})))
@@ -43,7 +43,7 @@ class TestWalletCollectibles(MultipleSharedDeviceTestCase):
self.wallet_view.collectibles_tab.click()
self.wallet_view.set_network_in_wallet(self.network_name)
collectibles = {
"BVL": {"quantity": 2,
"BVL": {"quantity": 1,
"info": {"Account": "Account 1",
"Network": "Base",
"category": "Football Player",
@@ -102,8 +102,8 @@ class TestWalletCollectibles(MultipleSharedDeviceTestCase):
self.wallet_view.collectibles_tab_on_select_token_view.click()
time.sleep(5)
self.wallet_view.get_collectible_element('BVL').click()
self.wallet_view.amount_input_increase_button.click()
self.wallet_view.confirm_button.click()
# self.wallet_view.amount_input_increase_button.click()
# self.wallet_view.confirm_button.click()
for text in [self.account_name, self.sender_short_address]:
if not self.wallet_view.from_data_container.get_child_element_by_text(text).is_element_displayed():
self.errors.append(self.wallet_view,
@@ -118,7 +118,7 @@ class TestWalletCollectibles(MultipleSharedDeviceTestCase):
data_to_check = {
'Est. time': ' min',
'Max fees': r"[$]\d+.\d+",
'Recipient gets': '2 '
'Recipient gets': '1 '
}
for key, expected_value in data_to_check.items():
try:
Binary file not shown.

Before

Width:  |  Height:  |  Size: 329 KiB

After

Width:  |  Height:  |  Size: 330 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB