[#3958] implemented transactions queue

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>

src/status_im/ui/screens/wallet/db.cljs

@@ -10,7 +10,8 @@
 
 (spec/def :wallet/send (spec/keys :req-un [:wallet.send/recipient]))
 
-(spec/def :wallet/wallet (spec/keys :opt-un [:wallet/send-transaction :wallet/request-transaction]))
+(spec/def :wallet/wallet (spec/keys :opt-un [:wallet/send-transaction :wallet/request-transaction
+                                             :wallet/transactions-queue]))
 
 ;; Placeholder namespace for wallet specs, which are a WIP depending on data
 ;; model we decide on for balances, prices, etc.

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

@@ -104,19 +104,11 @@
   (fn [_ _]
     {::show-transaction-moved  true}))
 
-;;TRANSACTION QUEUED signal from status-go
+(defn prepare-transaction [{:keys [id message_id args]} now]
-(handlers/register-handler-fx
-  :sign-request-queued
-  [(re-frame/inject-cofx :now)]
-  (fn [{:keys [db now]} [_ {:keys [id message_id method args]}]]
-    (cond
-
-      (= method constants/web3-send-transaction)
   ;;NOTE(goranjovic): the transactions started from chat using /send command
   ;; are only in ether, so this parameter defaults to ETH
-      (let [{:keys [from to value symbol data gas gasPrice] :or {symbol :ETH}} args
+  (let [{:keys [from to value symbol data gas gasPrice] :or {symbol :ETH}} args]
-            ;;TODO (andrey) revisit this map later (this map from old transactions, idk if we need all these fields)
+    {:id         id
-            transaction {:id         id
      :from       from
      :to         to
      :to-name    (when (nil? to)
@@ -129,9 +121,31 @@
      :gas-price  (when (seq gasPrice)
                    (money/bignumber (money/to-decimal gasPrice)))
      :timestamp  now
-                         :message-id message_id}
+     :message-id message_id}))
+
+;;TRANSACTION QUEUED signal from status-go
+(handlers/register-handler-fx
+  :sign-request-queued
+  (fn [{:keys [db]} [_ transaction]]
+    {:db (update-in db [:wallet :transactions-queue] conj transaction)
+     :dispatch [:check-transactions-queue]}))
+
+(handlers/register-handler-fx
+  :check-transactions-queue
+  [(re-frame/inject-cofx :now)]
+  (fn [{:keys [db now]} _]
+    (let [{:keys [send-transaction transactions-queue]} (:wallet db)
+          {:keys [id method args] :as queued-transaction} (last transactions-queue)
+          db' (update-in db [:wallet :transactions-queue] drop-last)]
+      (when (and (not (:id send-transaction)) queued-transaction)
+        (cond
+          ;;SEND TRANSACTION
+          (= method constants/web3-send-transaction)
+
+          (let [{:keys [gas gasPrice]} args
+                transaction (prepare-transaction queued-transaction now)
                 sending-from-bot-or-dapp? (not (get-in db [:wallet :send-transaction :waiting-signal?]))
-            new-db (assoc-in db [:wallet :transactions-unsigned id] transaction)
+                new-db (assoc-in db' [:wallet :transactions-unsigned id] transaction)
                 sending-db {:id         id
                             :method     method
                             :from-chat? sending-from-bot-or-dapp?}]
@@ -157,16 +171,17 @@
                    ::accept-transaction {:id           id
                                          :password     password
                                          :on-completed on-transactions-completed}}))))
-
+          ;;SIGN MESSAGE
           (= method constants/web3-personal-sign)
 
           (let [{:keys [data]} args
                 data' (transport.utils/to-utf8 data)]
-        (when data'
+            (if data'
-          {:db (-> db
+              {:db (-> db'
                        (assoc-in [:wallet :transactions-unsigned id] {:data data' :id id})
                        (assoc-in [:wallet :send-transaction] {:id id :method method}))
-           :dispatch [:navigate-to-modal :wallet-sign-message-modal]})))))
+               :dispatch [:navigate-to-modal :wallet-sign-message-modal]}
+              {:db db'})))))))
 
 (defn this-transaction-signing? [id signing-id view-id modal]
   (and (= signing-id id)
@@ -188,6 +203,7 @@
         ;;NO ERROR, DISCARDED, TIMEOUT or DEFAULT ERROR
         (if (this-transaction-signing? id (:id send-transaction) view-id modal)
           (cond-> {:db                      (-> db
+                                                (assoc-in [:wallet :transactions-queue] nil)
                                                 (update-in [:wallet :transactions-unsigned] dissoc id)
                                                 (update-in [:wallet :send-transaction] merge clear-send-properties))
                    :dispatch                [:navigate-back]}
@@ -333,3 +349,11 @@
      :db       (update-in db [:wallet :edit]
                           assoc
                           :gas (ethereum/estimate-gas (get-in db [:wallet :send-transaction :symbol])))}))
+
+(handlers/register-handler-fx
+  :close-transaction-sent-screen
+  (fn [{:keys [db]} _]
+    {:dispatch (if (= :wallet-send-transaction (second (:navigation-stack db)))
+                 [:navigate-to-clean :wallet]
+                 [:navigate-back])
+     :dispatch-later [{:ms 400 :dispatch [:check-transactions-queue]}]}))

src/status_im/ui/screens/wallet/send/subs.cljs

@@ -3,13 +3,6 @@
             [status-im.utils.money :as money]
             [status-im.utils.hex :as utils.hex]))
 
-(re-frame/reg-sub :wallet.sent/close-transaction-screen-event
-  :<- [:get :navigation-stack]
-  (fn [navigation-stack]
-    (case (second navigation-stack)
-      :wallet-send-transaction [:navigate-to-clean :wallet]
-      [:navigate-back])))
-
 (re-frame/reg-sub ::send-transaction
   :<- [:wallet]
   (fn [wallet]

src/status_im/ui/screens/wallet/send/transaction_sent/views.cljs

@@ -12,7 +12,6 @@
             [status-im.utils.platform :as platform]))
 
 (defview transaction-sent [& [modal?]]
-  (letsubs [close-transaction-screen-event [:wallet.sent/close-transaction-screen-event]]
   [react/view wallet.styles/wallet-modal-container
    [status-bar/status-bar {:type (if modal? :modal-wallet :transparent)}]
    [react/view styles/transaction-sent-container
@@ -25,21 +24,14 @@
     [react/view styles/gap]
     [react/text {:style styles/transaction-sent-description} (i18n/label :t/transaction-description)]]
    [react/view components.styles/flex]
-     ;; TODO (andrey) uncomment when will be implemented
-     #_[react/touchable-highlight {:on-press #()}; TODO (andrey) #(re-frame/dispatch [:navigate-to-clean :wallet-transaction-details])}
-        [react/view styles/transaction-details-container
-         [react/text {:style      styles/transaction-details
-                      :font       (if platform/android? :medium :default)
-                      :uppercase? true}
-          (i18n/label :t/view-transaction-details)]]]
    [components/separator]
-     [react/touchable-highlight {:on-press            #(re-frame/dispatch close-transaction-screen-event)
+   [react/touchable-highlight {:on-press            #(re-frame/dispatch [:close-transaction-sent-screen])
                                :accessibility-label :got-it-button}
     [react/view styles/got-it-container
      [react/text {:style      styles/got-it
                   :font       (if platform/android? :medium :default)
                   :uppercase? true}
-        (i18n/label :t/got-it)]]]]))
+      (i18n/label :t/got-it)]]]])
 
 (defview transaction-sent-modal []
   [transaction-sent true])