Update keycard connect stage while changing pin

src/status_im/contexts/chat/events.cljs

@@ -275,8 +275,7 @@
   {:events [:chat/unmute-chat-community]}
   [{:keys [db]} chat-id]
   (let [{:keys [community-id]} (get-in db [:chats chat-id])]
-    (when community-id
-      {:db (assoc-in db [:communities community-id :muted] false)})))
+    {:db (assoc-in db [:communities community-id :muted] false)}))
 
 (rf/defn mute-chat-failed
   {:events [:chat/mute-failed]}

src/status_im/contexts/keycard/change_pin/events.cljs

@@ -36,7 +36,7 @@
    {:db (assoc-in db [:keycard :change-pin :new-pin] (security/mask-data pin))}))
 
 (defn- change-pin-and-continue
-  [current-pin new-pin]
+  [change-pin-data]
   (rf/dispatch [:keycard/change-pin
                 {:on-success  (fn []
                                 (rf/dispatch [:navigate-back])
@@ -46,15 +46,18 @@
                                 (rf/dispatch [:navigate-back])
                                 (rf/dispatch [:keycard/disconnect])
                                 (rf/dispatch [:open-modal :screen/keycard.pin-change-failed]))
-                 :current-pin current-pin
-                 :new-pin     new-pin}]))
+                 :current-pin (security/safe-unmask-data (:current-pin change-pin-data))
+                 :new-pin     (security/safe-unmask-data (:new-pin change-pin-data))}]))
 
 (defn- verify-pin-and-continue
-  [current-pin new-pin]
+  [change-pin-data]
   (rf/dispatch
    [:keycard/verify-pin
-    {:pin        current-pin
-     :on-success #(change-pin-and-continue current-pin new-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)}]))
      :on-failure (fn [error]
                    (when-not (utils/tag-lost? (:error error))
                      (rf/dispatch [:keycard/disconnect])
@@ -63,11 +66,10 @@
 
 (rf/reg-event-fx :keycard/change-pin.verify-current-pin-and-continue
  (fn [{:keys [db]}]
-   (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)]
+   (let [key-uid         (get-in db [:profile/profile :key-uid])
+         change-pin-data (assoc (get-in db [:keycard :change-pin]) :key-uid key-uid)]
      {:fx [[:dispatch
             [:keycard/connect
              {:theme      :dark
-              :key-uid    (get-in db [:profile/profile :key-uid])
-              :on-success #(verify-pin-and-continue unmasked-current-pin unmasked-new-pin)}]]]})))
+              :key-uid    key-uid
+              :on-success #(verify-pin-and-continue change-pin-data)}]]]})))

test/appium/tests/critical/wallet/test_collectibles.py

@@ -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": 1,
+            "BVL": {"quantity": 2,
                     "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': '1 '
+            'Recipient gets': '2 '
         }
         for key, expected_value in data_to_check.items():
             try: