After dismissing error, no redirect to home and new qr can be

scanned.

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>

src/status_im/contact/core.cljs

@@ -271,7 +271,7 @@
     (if (some? validation-result)
       {:utils/show-popup {:title (i18n/label :t/unable-to-read-this-code)
                           :content validation-result
-                          :on-dismiss #(re-frame/dispatch [:navigate-to-clean :home])}}
+                          :on-dismiss #(re-frame/dispatch [:qr-scanner.ui/qr-code-error-dismissed])}}
       (fx/merge cofx
                 fx
                 (if config/partitioned-topic-enabled?

src/status_im/events.cljs

@@ -679,6 +679,11 @@
  (fn [cofx [_ identifier handler & [opts]]]
    (qr-scanner/scan-qr-code cofx identifier (merge {:handler handler} opts))))
 
+(handlers/register-handler-fx
+ :qr-scanner.ui/qr-code-error-dismissed
+ (fn [cofx [_ _]]
+   (qr-scanner/scan-qr-code-after-error-dismiss cofx)))
+
 (handlers/register-handler-fx
  :qr-scanner.callback/scan-qr-code-success
  (fn [cofx [_ context data]]

src/status_im/qr_scanner/core.cljs

@@ -1,6 +1,7 @@
 (ns status-im.qr-scanner.core
   (:require [re-frame.core :as re-frame]
             [status-im.i18n :as i18n]
+            [status-im.ui.screens.navigation :as navigation]
             [status-im.utils.utils :as utils]
             [status-im.utils.fx :as fx]))
 
@@ -18,10 +19,16 @@
                                               50))
                                            #(re-frame/dispatch [deny-handler qr-codes]))}})
 
+(fx/defn scan-qr-code-after-error-dismiss
+  [{:keys [db]}]
+  (let [view-id (:view-id db)]
+    {:db (assoc-in db [:navigation/screen-params view-id :barcode-read?] false)}))
+
 (fx/defn set-qr-code
   [{:keys [db]} context data]
   (merge {:db (-> db
                   (update :qr-codes dissoc context)
+                  (update-in [:navigation/screen-params :qr-scanner] assoc :barcode-read? true)
                   (dissoc :current-qr-context))}
          (when-let [qr-codes (:qr-codes db)]
            {:dispatch [(:handler qr-codes) context data (dissoc qr-codes :handler)]})))

src/status_im/ui/screens/add_new/models.cljs

@@ -6,17 +6,11 @@
             [status-im.utils.universal-links.core :as universal-links]
             [status-im.utils.fx :as fx]))
 
-(fx/defn process-qr-code
+(fx/defn handle-qr-code
   [cofx data]
   (if (spec/valid? :global/public-key data)
     (universal-links/handle-view-profile cofx data)
     (or (universal-links/handle-url cofx data)
         {:utils/show-popup {:title   (i18n/label :t/unable-to-read-this-code)
                             :content (i18n/label :t/use-valid-qr-code {:data data})
-                            :on-dismiss #(re-frame/dispatch [:navigate-to-clean :home])}})))
+                            :on-dismiss #(re-frame/dispatch [:qr-scanner.ui/qr-code-error-dismissed])}})))
-
-(fx/defn handle-qr-code
-  [cofx data]
-  (fx/merge cofx
-            (navigation/navigate-to-clean :home {})
-            (process-qr-code data)))

src/status_im/ui/screens/events.cljs

@@ -178,7 +178,11 @@
  :screens/on-will-focus
  (fn [{:keys [db] :as cofx} [_ view-id]]
    (fx/merge cofx
-             {:db (assoc db :view-id view-id)}
+             (if (= view-id :qr-scanner)
+               {:db (-> db
+                        (assoc :view-id view-id)
+                        (assoc-in [:navigation/screen-params view-id :barcode-read?] false))}
+               {:db (assoc db :view-id view-id)})
              #(case view-id
                 :keycard-settings (hardwallet/settings-screen-did-load %)
                 :reset-card (hardwallet/reset-card-screen-did-load %)

src/status_im/ui/screens/qr_scanner/views.cljs

@@ -24,16 +24,16 @@
   (re-frame/dispatch [:qr-scanner.callback/scan-qr-code-success identifier (camera/get-qr-code-data data)]))
 
 (defview qr-scanner []
-  (letsubs [{identifier :current-qr-context} [:get-screen-params]
+  (letsubs [{identifier :current-qr-context
-            camera-initialized? (reagent/atom false)
+             barcode-read-sub? :barcode-read?} [:get-screen-params]
-            barcode-read? (reagent/atom false)]
+            camera-initialized? (reagent/atom false)]
+    (let [barcode-read? barcode-read-sub?]
       [react/view styles/barcode-scanner-container
        [qr-scanner-toolbar (or (:toolbar-title identifier) (i18n/label :t/scan-qr)) identifier]
        [camera/camera {:onBarCodeRead #(if (:multiple? identifier)
                                          (on-barcode-read identifier %)
-                                       (when-not @barcode-read?
+                                         (when-not barcode-read?
-                                         (do (reset! barcode-read? true)
+                                           (on-barcode-read identifier %)))
-                                             (on-barcode-read identifier %))))
                        :ref           #(reset! camera-initialized? true)
                        :captureAudio  false
                        :style         styles/barcode-scanner}]
@@ -46,4 +46,4 @@
          [react/image {:source {:uri :corner_right_bottom}
                        :style  styles/corner-right-bottom}]
          [react/image {:source {:uri :corner_left_bottom}
-                     :style  styles/corner-left-bottom}]]]]))
+                       :style  styles/corner-left-bottom}]]]])))