[BUG #2133] Correctly parse/generate amount from QR code

src/status_im/ui/screens/wallet/choose_recipient/events.cljs

@@ -10,30 +10,31 @@
           toggled-state (if (= :on flashlight-state) :off :on)]
       (assoc-in db [:wallet/send-transaction :camera-flashlight] toggled-state))))
 
-(defn choose-address-and-name [db address name]
+(defn choose-address-and-name [db address name amount]
-  (update db :wallet/send-transaction assoc :to-address address :to-name name))
+  (update db :wallet/send-transaction assoc :to-address address :to-name name :amount amount))
 
-(defn- extract-address [s]
+(defn- extract-details
-  ;; First try to parse as EIP67 URI, if not assume this is an address directly
+  "First try to parse as EIP67 URI, if not assume this is an address directly.
-  (if-let [m (eip67/parse-uri s)]
+   Returns a map containing at least the `address` key"
-    (:address m)
+  [s]
-    s))
+  (or (eip67/parse-uri s) {:address s}))
 
 (handlers/register-handler-fx
   :choose-recipient
   (fn [{{:keys [web3] :as db} :db} [_ data name]]
     (let [{:keys [view-id]} db
-          address (extract-address data)
+          m              (extract-details data)
+          address        (:address m)
           ;; isAddress works with or without address with leading '0x'
           valid-address? (.isAddress web3 address)]
       (cond-> {:db db}
               (= :choose-recipient view-id) (assoc :dispatch [:navigate-back])
-              valid-address? (update :db #(choose-address-and-name % address name))
+              valid-address? (update :db #(choose-address-and-name % address name (:value m)))
               (not valid-address?) (assoc :show-error (i18n/label :t/wallet-invalid-address {:data data}))))))
 
 (handlers/register-handler-fx
   :wallet-open-send-transaction
   (fn [{db :db} [_ address name]]
-    {:db         (choose-address-and-name db address name)
+    {:db         (choose-address-and-name db address name nil)
      :dispatch-n [[:navigate-back]
                   [:navigate-back]]}))

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

@@ -29,15 +29,16 @@
                        :action  :request
                        :params  {:hide-actions? true}}]))
 
-(views/defview qr-code []
+(views/defview qr-code [amount]
   (views/letsubs [account [:get-current-account]]
     [components.qr-code/qr-code
-     {:value   (eip67/generate-uri (:address account))
+     {:value   (eip67/generate-uri (:address account) {:value amount})
       :size    256}]))
 
 (views/defview request-transaction []
   ;;Because input field is in the end of view we will scroll to the end on input focus event
-  (views/letsubs [amount-error [:get-in [:wallet/request-transaction :amount-error]]
+  (views/letsubs [amount           [:get-in [:wallet/request-transaction :amount]]
+                  amount-error     [:get-in [:wallet/request-transaction :amount-error]]
                   request-enabled? [:wallet.request/request-enabled?]
                   scroll           (atom nil)]
     [react/keyboard-avoiding-view wallet.styles/wallet-modal-container
@@ -48,7 +49,7 @@
       [react/view components.styles/flex
         [react/view styles/network-container
          [react/view styles/qr-container
-          [qr-code]]]
+          [qr-code amount]]]
         [react/view wallet.styles/choose-wallet-container
          [components/choose-wallet]]
         [react/view wallet.styles/amount-container