bugfixing

Author: flexsurfer

src/status_im/keycard/login.cljs

@@ -17,7 +17,7 @@
   [{:keys [db] :as cofx}]
   (fx/merge cofx
             {:db db}
-            (navigation/navigate-to-cofx :multiaccounts nil)))
+            (navigation/pop-to-root-tab :multiaccounts-stack)))
 
 (fx/defn login-pin-more-icon-pressed
   {:events [:keycard.login.pin.ui/more-icon-pressed]}

src/status_im/multiaccounts/login/core.cljs

@@ -435,7 +435,7 @@
                   (assoc-in [:keycard :pin :status] nil)
                   (assoc-in [:keycard :pin :login] []))})
        #(if keycard-account?
-          {:rnn-navigate-to-fx :keycard-login-pin}
+          {:init-root-with-component-fx [:multiaccounts-keycard :multiaccounts]}
           {:init-root-fx :multiaccounts})))))
 
 (fx/defn get-credentials
@@ -532,11 +532,12 @@
   [{:keys [db] :as cofx} key-uid]
   ;; We specifically pass a bunch of fields instead of the whole multiaccount
   ;; as we want store some fields in multiaccount that are not here
-  (let [multiaccount (get-in db [:multiaccounts/multiaccounts key-uid])]
+  (let [multiaccount (get-in db [:multiaccounts/multiaccounts key-uid])
+        keycard-multiaccount? (boolean (:keycard-pairing multiaccount))]
     (fx/merge
      cofx
      {:db (update db :keycard dissoc :application-info)
-      :rnn-navigate-to-fx :login}
+      :rnn-navigate-to-fx (if keycard-multiaccount? :keycard-login-pin :login)}
      (open-login (select-keys multiaccount [:key-uid :name :public-key :identicon :images])))))
 
 (fx/defn hide-keycard-banner

src/status_im/navigation.cljs

@@ -66,6 +66,11 @@
   [_ root-id]
   {:init-root-fx root-id})
 
+(fx/defn init-root-with-component
+  {:events [:init-root-with-component]}
+  [_ root-id comp-id]
+  {:init-root-with-component-fx [root-id comp-id]})
+
 (fx/defn rnn-navigate-to
   {:events [:rnn-navigate-to]}
   [_ key]

src/status_im/navigation/core.cljs

@@ -149,7 +149,14 @@
  :init-root-fx
  (fn [new-root-id]
    (reset! root-comp-id new-root-id)
-   (reset! root-id new-root-id)
+   (reset! root-id @root-comp-id)
+   (.setRoot Navigation (clj->js (get (roots/roots) new-root-id)))))
+
+(re-frame/reg-fx
+ :init-root-with-component-fx
+ (fn [[new-root-id new-root-comp-id]]
+   (reset! root-comp-id new-root-comp-id)
+   (reset! root-id @root-comp-id)
    (.setRoot Navigation (clj->js (get (roots/roots) new-root-id)))))
 
 (defonce rset-app-launched

src/status_im/navigation/roots.cljs

@@ -22,7 +22,7 @@
 
 (defn bottom-tab-general [icon accessibility]
   (merge
-   {:accessibilityLabel accessibility
+   {:testID accessibility
     :fontSize  11
     :icon (icons/icon-source icon)
     :badgeColor colors/blue
@@ -142,6 +142,17 @@
                    :options  (merge (default-root)
                                     {:topBar (topbar-options)})}}}
 
+   :multiaccounts-keycard
+   {:root {:stack {:id       :multiaccounts-stack
+                   :children [{:component {:name    :multiaccounts
+                                           :id      :multiaccounts
+                                           :options (get-screen-options :multiaccounts)}}
+                              {:component {:name    :keycard-login-pin
+                                           :id      :keycard-login-pin
+                                           :options (get-screen-options :keycard-login-pin)}}]
+                   :options  (merge (default-root)
+                                    {:topBar (topbar-options)})}}}
+
    ;;WELCOME
    :welcome
    {:root {:stack {:children [{:component {:name    :welcome

src/status_im/popover/core.cljs

@@ -3,10 +3,10 @@
 
 (fx/defn show-popover
   {:events [:show-popover]}
-  [{:keys [db]} value]
+  [_ value]
   {:rnn-show-popover nil
    ;;TODO refactor popover just start animation on mount
-   :dispatch-later   [{:ms 50 :dispatch [:show-popover-db value]}]
+   :dispatch-later   [{:ms 250 :dispatch [:show-popover-db value]}]
    :dismiss-keyboard nil})
 
 (fx/defn show-popover-db

src/status_im/ui/screens/screens.cljs

@@ -775,17 +775,20 @@
            ;;KEYSTORAGE
            {:name      :actions-not-logged-in
             ;;TODO: topbar
+            :insets    {:bottom true}
             :options   {:topBar {:visible false}}
             ;;TODO move to popover?
             :component key-storage.views/actions-not-logged-in}
            {:name      :actions-logged-in
             ;;TODO: topbar
             :options   {:topBar {:visible false}}
+            :insets    {:bottom true}
             ;;TODO move to popover?
             :component key-storage.views/actions-logged-in}
            {:name      :storage
             ;;TODO: topbar
             :options   {:topBar {:visible false}}
+            :insets    {:bottom true}
             ;;TODO move to popover?
             :component key-storage.views/storage}]
 

src/status_im/ui/screens/wallet/send/views.cljs

@@ -249,15 +249,16 @@
             :after               :main-icon/next
             :disabled            (not sign-enabled?)
             :on-press            #(do
+                                    (re-frame/dispatch [:navigate-back])
                                     (re-frame/dispatch
                                      [(cond
                                         request?
                                         :wallet.ui/sign-transaction-button-clicked-from-request
                                         from-chat?
                                         :wallet.ui/sign-transaction-button-clicked-from-chat
                                         :else
-                                        :wallet.ui/sign-transaction-button-clicked) tx])
-                                    (re-frame/dispatch [:navigate-back]))}
+                                        :wallet.ui/sign-transaction-button-clicked) tx]))}
+
            (if (and (not request?) from-chat? (not to-norm))
              (i18n/label :t/wallet-send)
              (i18n/label :t/next))]}]]])))