feat(wallet): add ability to send a token #18242
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| (ns status-im.contexts.wallet.data-store | ||
| (:require | ||
| [clojure.set :as set] | ||
| [clojure.string :as string] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,17 @@ | ||
| (ns status-im.contexts.wallet.send.events | ||
| (:require | ||
| [camel-snake-kebab.core :as csk] | ||
| [camel-snake-kebab.extras :as cske] | ||
| [status-im.constants :as constants] | ||
| [status-im.contexts.wallet.send.utils :as send-utils] | ||
| [taoensso.timbre :as log] | ||
| [utils.money :as money] | ||
| [utils.number] | ||
| [utils.re-frame :as rf])) | ||
|
|
||
| (rf/reg-event-fx :wallet/select-address-tab | ||
| (fn [{:keys [db]} [tab]] | ||
|
|
||
|
There was a problem hiding this comment. will delete empty line 👍 |
||
| {:db (assoc-in db [:wallet :ui :send :select-address-tab] tab)})) | ||
|
|
||
| (rf/reg-event-fx :wallet/select-send-account-address | ||
|
|
@@ -17,10 +21,14 @@ | |
| (rf/reg-event-fx :wallet/suggested-routes-success | ||
| (fn [{:keys [db]} [suggested-routes timestamp]] | ||
| (when (= (get-in db [:wallet :ui :send :suggested-routes-call-timestamp]) timestamp) | ||
| (let [suggested-routes-data (cske/transform-keys csk/->kebab-case suggested-routes) | ||
| chosen-route (->> suggested-routes-data | ||
| :best | ||
| first)] | ||
| {:db (-> db | ||
| (assoc-in [:wallet :ui :send :suggested-routes] suggested-routes-data) | ||
| (assoc-in [:wallet :ui :send :route] chosen-route) | ||
| (assoc-in [:wallet :ui :send :loading-suggested-routes?] false))})))) | ||
|
|
||
| (rf/reg-event-fx :wallet/suggested-routes-error | ||
| (fn [{:keys [db]} [_error]] | ||
|
|
@@ -47,8 +55,9 @@ | |
| :fx [[:navigate-to-within-stack [:wallet-send-input-amount stack-id]]]})) | ||
|
|
||
| (rf/reg-event-fx :wallet/send-select-amount | ||
| (fn [{:keys [db]} [{:keys [amount stack-id]}]] | ||
| {:db (assoc-in db [:wallet :ui :send :amount] amount) | ||
|
|
||
| :fx [[:navigate-to-within-stack [:wallet-transaction-confirmation stack-id]]]})) | ||
|
|
||
|
|
||
| (rf/reg-event-fx :wallet/get-suggested-routes | ||
| (fn [{:keys [db now]} [amount]] | ||
|
|
@@ -59,7 +68,7 @@ | |
| token-id (:symbol token) | ||
| network-preferences [] | ||
| gas-rates constants/gas-rate-medium | ||
| amount-in (send-utils/amount-in-hex amount token-decimal) | ||
| from-address wallet-address | ||
| disabled-from-chain-ids [] | ||
| disabled-to-chain-ids [] | ||
|
|
@@ -88,3 +97,69 @@ | |
| {:event :wallet/get-suggested-routes | ||
| :error error | ||
| :params request-params}))}]}))) | ||
|
|
||
| (rf/reg-event-fx :wallet/add-authorized-transaction | ||
| (fn [{:keys [db]} [transaction]] | ||
| (let [transaction-hashes (:hashes transaction) | ||
| chain-id (key (first transaction-hashes)) | ||
| tx-id (first (val (first transaction-hashes))) | ||
|
Comment on lines
+103
to
+105
There was a problem hiding this comment. Why do we only get the first item? what is contained in the rest of them? There was a problem hiding this comment. ah this is a temporary solution, will adjust properly when we go to implement the transaction progress page. There was a problem hiding this comment. Discussed with @ulisesmac - will create an issue for this feature and mention this needs to be reworked. 👍 |
||
| transaction-detes {:status :pending | ||
ulisesmac marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| :id (:id transaction) | ||
| :chain-id chain-id}] | ||
| {:db (assoc-in db [:wallet :transactions tx-id] transaction-detes) | ||
|
There was a problem hiding this comment. Just a question here, Are transactions associated to an account? There was a problem hiding this comment. let's discuss this today! |
||
| :fx [[:dispatch [:navigate-to :wallet-transaction-progress]]]}))) | ||
|
|
||
| (defn- transaction-bridge | ||
| [{:keys [from-address to-address route]}] | ||
| (let [{:keys [from bridge-name amount-out gas-amount gas-fees]} route | ||
| {:keys [gas-price max-fee-per-gas-medium max-priority-fee-per-gas]} gas-fees] | ||
| [{:BridgeName bridge-name | ||
| :ChainID (:chain-id from) | ||
| :TransferTx {:From from-address | ||
| :To to-address | ||
| :Gas (money/to-hex gas-amount) | ||
| :GasPrice (money/to-hex (money/->wei :gwei gas-price)) | ||
| :Value amount-out | ||
| :Nonce nil | ||
| :MaxFeePerGas (money/to-hex (money/->wei :gwei max-fee-per-gas-medium)) | ||
| :MaxPriorityFeePerGas (money/to-hex (money/->wei :gwei max-priority-fee-per-gas)) | ||
| :Input "" | ||
| :Data "0x"}}])) | ||
|
|
||
| (defn- multi-transaction-command | ||
| [{:keys [from-address to-address from-asset to-asset amount-out transfer-type] | ||
| :or {transfer-type constants/send-type-transfer}}] | ||
| {:fromAddress from-address | ||
| :toAddress to-address | ||
| :fromAsset from-asset | ||
| :toAsset to-asset | ||
| :fromAmount amount-out | ||
| :type transfer-type}) | ||
|
|
||
| (rf/reg-event-fx :wallet/send-transaction | ||
| (fn [{:keys [db]} [sha3-pwd]] | ||
|
Comment on lines
+139
to
+140
|
||
| (let [route (get-in db [:wallet :ui :send :route]) | ||
| from-address (get-in db [:wallet :current-viewing-account-address]) | ||
| to-address (get-in db [:wallet :ui :send :to-address]) | ||
| token (get-in db [:wallet :ui :send :token]) | ||
| token-id (:symbol token) | ||
| request-params [(multi-transaction-command {:from-address from-address | ||
| :to-address to-address | ||
| :from-asset token-id | ||
| :to-asset token-id | ||
| :amount-out (:amount-out route)}) | ||
| (transaction-bridge {:to-address to-address | ||
| :from-address from-address | ||
| :route route}) | ||
| sha3-pwd]] | ||
| {:json-rpc/call [{:method "wallet_createMultiTransaction" | ||
| :params request-params | ||
| :on-success (fn [result] | ||
| (rf/dispatch [:hide-bottom-sheet]) | ||
| (rf/dispatch [:wallet/add-authorized-transaction result])) | ||
| :on-error (fn [error] | ||
| (log/error "failed to send transaction" | ||
| {:event :wallet/send-transaction | ||
| :error error | ||
| :params request-params}))}]}))) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ulisesmac & I found a bug where empty tokens didn't sit right, this fix that 👍