This commit is contained in:
Omar Basem 2024-05-17 11:48:41 +04:00
parent d7f3946c06
commit b311c8be5c
No known key found for this signature in database
GPG Key ID: 62420DCCB9645167
3 changed files with 4 additions and 9 deletions

View File

@ -7,5 +7,4 @@
:skip-step? (fn [db] (some? (get-in db [:wallet :ui :send :bridge-to-chain-id])))}
{:screen-id :screen/wallet.bridge-input-amount
:skip-step? (fn [db] (some? (get-in db [:wallet :ui :send :amount])))}
{:screen-id :screen/wallet.transaction-confirmation}
{:screen-id :screen/wallet.transaction-progress}])
{:screen-id :screen/wallet.transaction-confirmation}])

View File

@ -387,10 +387,7 @@
{:db (-> db
(assoc-in [:wallet :transactions] transaction-details)
(assoc-in [:wallet :ui :send :transaction-ids] transaction-ids))
:fx [[:dispatch
[:wallet/wizard-navigate-forward
{:current-screen :screen/wallet.transaction-confirmation
:flow-id :wallet-send-flow}]]]})))
:fx [[:dispatch [:dismiss-modal :screen/wallet.transaction-confirmation]]]})))
(rf/reg-event-fx :wallet/close-transaction-progress-page
(fn [_]
@ -399,7 +396,7 @@
[:dispatch [:wallet/clean-send-address]]
[:dispatch [:wallet/clean-disabled-from-networks]]
[:dispatch [:wallet/select-address-tab nil]]
[:dispatch [:dismiss-modal :screen/wallet.transaction-progress]]]}))
[:dispatch [:dismiss-modal :screen/wallet.transaction-confirmation]]]}))
(defn- transaction-data
[{:keys [from-address to-address token-address route data eth-transfer?]}]

View File

@ -24,5 +24,4 @@
:skip-step? (fn [db]
(or (not (collectible-selected? db))
(some? (get-in db [:wallet :ui :send :amount]))))}
{:screen-id :screen/wallet.transaction-confirmation}
{:screen-id :screen/wallet.transaction-progress}])
{:screen-id :screen/wallet.transaction-confirmation}])