From 90c26570f8d685411ded484e2c17a2922838273f Mon Sep 17 00:00:00 2001 From: Mihael Konjevic Date: Tue, 15 Aug 2017 21:04:53 +0200 Subject: [PATCH] [FIX #148] Disable back button on QR code reader page until camera is available. --- src/status_im/ui/screens/qr_scanner/views.cljs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/status_im/ui/screens/qr_scanner/views.cljs b/src/status_im/ui/screens/qr_scanner/views.cljs index 0d4a2bef24..1eb8737f7a 100644 --- a/src/status_im/ui/screens/qr_scanner/views.cljs +++ b/src/status_im/ui/screens/qr_scanner/views.cljs @@ -12,26 +12,30 @@ [status-im.components.toolbar.styles :refer [toolbar-background1]] [status-im.ui.screens.qr-scanner.styles :as st] [status-im.utils.types :refer [json->clj]] - [clojure.string :as str])) + [clojure.string :as str] + [reagent.core :as r])) -(defview qr-scanner-toolbar [title] +(defview qr-scanner-toolbar [title hide-nav?] (letsubs [modal [:get :modal]] [view [status-bar] [toolbar {:title title :background-color toolbar-background1 + :hide-nav? hide-nav? :nav-action (when modal (act/back #(dispatch [:navigate-back])))}]])) (defview qr-scanner [] - (letsubs [identifier [:get :current-qr-context]] + (letsubs [identifier [:get :current-qr-context] + camera-initialized? (r/atom false)] [view st/barcode-scanner-container - [qr-scanner-toolbar (:toolbar-title identifier)] + [qr-scanner-toolbar (:toolbar-title identifier) (not @camera-initialized?)] [camera {:onBarCodeRead (fn [code] (let [data (-> (.-data code) (str/replace #"ethereum:" ""))] (dispatch [:set-qr-code identifier data]))) ;:barCodeTypes [:qr] + :ref #(reset! camera-initialized? true) :captureAudio false :style st/barcode-scanner}] [view st/rectangle-container