conflict resolve

Author: flexsurfer

src/status_im/keycard/recovery.cljs

@@ -216,7 +216,7 @@
                                   :content (i18n/label (if (= backup-type :recovery-card)
                                                          :t/keycard-can-use-with-new-passcode :t/keycard-backup-success-body))}}
             (if (multiaccounts.model/logged-in? cofx)
-              (navigation/navigate-to-cofx :profile-stack {:screen :keycard-settings})
+              (navigation/navigate-to-cofx :keycard-settings nil)
               (return-to-keycard-login))))
 
 (fx/defn on-generate-and-load-key-success

src/status_im/navigation.cljs

@@ -17,7 +17,6 @@
   [_ config]
   {::navigate-reset config})
 
-
 (defn- all-screens-params [db view screen-params]
   (cond-> db
           (and (seq screen-params) (:screen screen-params) (:params screen-params))

src/status_im/ui/screens/intro/styles.cljs

@@ -40,6 +40,7 @@
 
 (def wizard-title
   {:margin-bottom 16
+   :typography    :header
    :text-align    :center})
 
 (def buttons-container

src/status_im/ui/screens/onboarding/intro/styles.cljs

@@ -3,6 +3,7 @@
 
 (def wizard-title
   {:margin-bottom 16
+   :typography    :header
    :text-align    :center})
 
 (defn wizard-text []