make qr-scanner callable multiple times from different screens

Former-commit-id: 6eeefb2efb

src/status_im/contacts/handlers.cljs

@@ -111,3 +111,13 @@
 (register-handler :add-new-contact
   (after save-contact)
   add-new-contact)
+
+(defn set-new-contact-from-qr [db [_ identifier]]
+  (let [new-contact (:new-contact db)
+        qr-contact (get-in db [:qr-codes identifier])]
+    (-> db
+        (assoc :new-contact (merge new-contact qr-contact))
+        (update-in db [:qr-codes] dissoc identifier))))
+
+(register-handler :set-new-contact-from-qr
+  (-> set-new-contact-from-qr))

src/status_im/contacts/views/new_contact.cljs

@@ -23,11 +23,11 @@
                                                  toolbar-background2
                                                  form-text-input]]
             [status-im.i18n :refer [label]]
-            [status-im.contacts.styles :as st]))
+            [status-im.contacts.styles :as st]
+            [status-im.utils.logging :as log]))
 
 (defn import-qr-button []
-  [touchable-highlight {:on-press #(dispatch [:navigate-to
+  [touchable-highlight {:on-press #(dispatch [:scan-qr-code :new-contact])}
-                                              :qr-scanner])}
    [view st/import-qr-button
     [view st/import-qr-button-content
      [icon {:name :qr-scanner
@@ -55,7 +55,10 @@
     address])
 
 (defview new-contact []
-  [{:keys [name address whisper-identity phone-number] :as new-contact} [:get :new-contact]]
+  [{:keys [name address whisper-identity phone-number] :as new-contact} [:get :new-contact]
+   qr-contact [:get-in [:qr-codes :new-contact]]]
+  (let [_ (log/debug qr-contact)
+        _ (when qr-contact (dispatch [:set-new-contact-from-qr :new-contact]))]
   [drawer-view
    [view st/contact-form-container
     [toolbar {:title            (label :t/new-contact)
@@ -67,4 +70,4 @@
     [contact-name-input name]
     [contact-address-input address]
     [text (str "Whisper identity: " whisper-identity)]
-    ]])
+    ]]))

src/status_im/db.cljs

@@ -29,6 +29,7 @@
              :email                  "myemail@gmail.com"
              :status                 "Hi, this is my status"
              :current-tag            nil
+             :qr-codes               {:identifier nil}
              :new-contact            {:name             ""
                                       :address          ""
                                       :whisper-identity ""

src/status_im/handlers.cljs

@@ -17,6 +17,7 @@
     status-im.discovery.handlers
     status-im.new-group.handlers
     status-im.participants.handlers
+    status-im.qr-scanner.handlers
     status-im.protocol.handlers))
 
 ;; -- Middleware ------------------------------------------------------------

src/status_im/i18n.cljs

@@ -11,8 +11,8 @@
 (defn label [path & options]
   (.t js/I18n (name path) (clj->js options)))
 
-(defn label-pluralize [count path]
+(defn label-pluralize [count path & options]
-  (.p js/I18n count (name path)))
+  (.p js/I18n count (name path) (clj->js options)))
 
 (comment
   (defn deep-merge [& maps]

src/status_im/qr_scanner/handlers.cljs

@@ -0,0 +1,12 @@
+(ns status-im.qr-scanner.handlers
+  (:require [re-frame.core :refer [register-handler after dispatch debug enrich]]))
+
+(defn set-current-identifier [db [_ identifier]]
+  (assoc-in db [:qr-codes :identifier] identifier))
+
+(register-handler :scan-qr-code
+  (-> set-current-identifier
+      ((after (fn [_ _] (dispatch [:navigate-to :qr-scanner]))))))
+
+(register-handler :clear-qr-code [db [_ identifier]]
+  (update-in db [:qr-codes] dissoc identifier))

src/status_im/qr_scanner/screen.cljs

@@ -21,15 +21,12 @@
             :background-color toolbar-background2}])
 
 (defview qr-scanner []
-  []
+  [identifier [:get-in [:qr-codes :identifier]]]
   [view st/barcode-scanner-container
    [qr-scanner-toolbar]
    [camera {:onBarCodeRead (fn [data]
-                             (let [{:keys [name address whisper-identity phone-number] :as contact} (json->clj (.-data data))]
+                             (let [data (json->clj (.-data data))]
-                               (when name (dispatch [:set-in [:new-contact :name] name]))
+                               (dispatch [:set-in [:qr-codes (or identifier :current)] data])
-                               (when address (dispatch [:set-in [:new-contact :address] address]))
-                               (when whisper-identity (dispatch [:set-in [:new-contact :whisper-identity] whisper-identity]))
-                               (when phone-number (dispatch [:set-in [:new-contact :phone-number] phone-number]))
                                (dispatch [:navigate-back])))
             :style st/barcode-scanner}]
    [view st/rectangle-container