Skip to content

Commit

Permalink
feat: integrate max slippage drawer (#21295)
Browse files Browse the repository at this point in the history 
Signed-off-by: Brian Sztamfater <[email protected]>
  • Loading branch information
@briansztamfater
briansztamfater authored Sep 25, 2024
1 parent 59c2b79 commit fdc814c
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/quo/components/settings/data_item/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
colors/neutral-50)]
[rn/pressable
{:accessibility-label :data-item
:disabled (not right-icon)
:disabled (nil? on-press)
:on-press on-press
:style (merge (style/container {:size size
:card? card?
Expand Down
1 change: 1 addition & 0 deletions src/status_im/constants.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@
(def ^:const slippages [0.1 0.5 1])
(def ^:const default-slippage 0.5)
(def ^:const max-recommended-slippage 5)
(def ^:const max-slippage 30)
(def ^:const max-slippage-decimal-places 2)
(def ^:const swap-provider-paraswap
{:name :paraswap
Expand Down
59 changes: 46 additions & 13 deletions src/status_im/contexts/wallet/sheets/slippage_settings/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,24 @@
(:require [clojure.string :as string]
[quo.core :as quo]
[react-native.core :as rn]
[react-native.platform :as platform]
[status-im.constants :as constants]
[status-im.contexts.wallet.sheets.slippage-settings.style :as style]
[utils.i18n :as i18n]
[utils.number]
[utils.money :as money]
[utils.number :as number]
[utils.re-frame :as rf]))

(defn- validate-slippage
[slippage]
(let [slippage-value (utils.number/parse-float slippage)]
(let [slippage-value (number/parse-float slippage)]
(cond
(<= slippage-value 0)
{:message (i18n/label :t/slippage-should-be-more-than-0)
:type :error}
(> slippage-value constants/max-slippage)
{:message (i18n/label :t/slippage-cant-be-more-than-30)
:type :error}
(> (count (second (string/split slippage ".")))
constants/max-slippage-decimal-places)
{:message (i18n/label :t/max-2-decimals)
Expand All @@ -33,14 +38,37 @@
(subs s 0 (dec (count s)))
(str s k)))

(defn- calculate-receive-amount
[asset-to-receive amount-out max-slippage]
(let [receive-token-decimals (:decimals asset-to-receive)
amount-out-whole-number (number/hex->whole amount-out receive-token-decimals)
amount-out-num (number/to-fixed amount-out-whole-number
(min constants/min-token-decimals-to-display
receive-token-decimals))
slippage-num (-> (money/bignumber amount-out-num)
(money/mul (money/bignumber max-slippage))
(money/div (money/bignumber 100)))
amount-out-minus-slippage (money/sub (money/bignumber amount-out-num) slippage-num)
receive-amount (if (money/greater-than amount-out-minus-slippage
(money/bignumber 0))
(str amount-out-minus-slippage)
0)]
receive-amount))

(defn view
[]
(let [current-slippage (rf/sub [:wallet/swap-max-slippage])
account-color (rf/sub [:wallet/current-viewing-account-color])
asset-to-receive (rf/sub [:wallet/swap-asset-to-receive])
amount-out (rf/sub [:wallet/swap-proposal-amount-out])
[max-slippage set-max-slippage] (rn/use-state (str current-slippage))
[error set-error] (rn/use-state nil)
[custom? set-custom?] (rn/use-state (not-any? #{current-slippage}
constants/slippages))
receive-token-symbol (:symbol asset-to-receive)
receive-amount (calculate-receive-amount asset-to-receive
amount-out
max-slippage)
handle-slippage-change (rn/use-callback
(fn [value]
(let [new-slippage (update-string-on-keypress value
Expand All @@ -50,7 +78,8 @@
[max-slippage set-max-slippage set-error])
on-select-slippage (rn/use-callback (fn [slippage]
(set-max-slippage (str slippage))
(set-custom? (not slippage)))
(set-custom? (nil? slippage))
(when slippage (set-error nil)))
[set-max-slippage set-custom?])
save-disabled? (rn/use-memo (fn []
(or (= max-slippage (str current-slippage))
Expand All @@ -73,19 +102,23 @@
[quo/drawer-action
(cond-> {:title (str slippage "%")
:on-press #(on-select-slippage slippage)}
(= (str slippage) max-slippage) (assoc :state :selected))])
(and (= (str slippage) max-slippage) (not custom?)) (assoc :state :selected))])
constants/slippages)
[quo/drawer-action
(cond-> {:title (i18n/label :t/custom)
:action :input
:on-press #(on-select-slippage nil)
:input-props {:auto-focus true
:customization-color account-color
:placeholder (i18n/label :t/type-slippage)
:right-icon {:icon-name :i/percentage
:on-press identity
:style-fn style/percentage-icon}
:value max-slippage}}
:input-props {:auto-focus true
:customization-color account-color
:placeholder (i18n/label :t/type-slippage)
:right-icon {:icon-name :i/percentage
:on-press identity
:style-fn style/percentage-icon}
:value max-slippage
:show-soft-input-on-focus false
:on-focus (fn []
(when platform/android?
(rf/dispatch [:dismiss-keyboard])))}}
custom? (assoc :state :selected))]]
(when (and custom? error)
[quo/info-message
Expand All @@ -107,8 +140,8 @@
:description :top
:context-tag-props {:size 24
:type :token
:token "USDT"
:amount "99.97"} ;; will be replaced with real data later
:token receive-token-symbol
:amount receive-amount}
:description-top-text (i18n/label :t/receive-at-least)}]
(when custom?
[quo/numbered-keyboard
Expand Down
12 changes: 8 additions & 4 deletions src/status_im/contexts/wallet/swap/setup_swap/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
[status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
[status-im.contexts.wallet.common.utils :as utils]
[status-im.contexts.wallet.sheets.buy-token.view :as buy-token]
[status-im.contexts.wallet.sheets.slippage-settings.view :as slippage-settings]
[status-im.contexts.wallet.swap.setup-swap.style :as style]
[status-im.contexts.wallet.swap.utils :as swap-utils]
[utils.debounce :as debounce]
Expand Down Expand Up @@ -39,7 +40,7 @@
{:clean-approval-transaction? clean-approval-transaction?}])))

(defn- data-item
[{:keys [title subtitle size subtitle-icon subtitle-color loading?]}]
[{:keys [title subtitle size subtitle-icon subtitle-color on-press loading?]}]
[quo/data-item
{:container-style style/detail-item
:blur? false
Expand All @@ -50,7 +51,8 @@
:subtitle subtitle
:size size
:icon subtitle-icon
:subtitle-color subtitle-color}])
:subtitle-color subtitle-color
:on-press on-press}])

(defn- transaction-details
[]
Expand All @@ -72,9 +74,11 @@
theme)))]
[data-item
{:title (i18n/label :t/max-slippage)
:subtitle max-slippage
:subtitle (str max-slippage "%")
:subtitle-icon :i/edit
:size :small}]]))
:size :small
:on-press #(rf/dispatch [:show-bottom-sheet
{:content slippage-settings/view}])}]]))

(defn- pay-token-input
[{:keys [input-state on-max-press on-input-focus on-token-press on-approve-press input-focused?]}]
Expand Down
1 change: 1 addition & 0 deletions translations/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2320,6 +2320,7 @@
"slide-to-sign": "Slide to sign",
"slide-to-swap": "Slide to swap",
"slippage": "Slippage",
"slippage-cant-be-more-than-30": "Slippage can't be more than 30",
"slippage-may-be-higher-than-necessary": "Slippage may be higher than necessary",
"slippage-settings": "Slippage settings",
"slippage-settings-description": "Your transaction will revert if the price changes more than the slippage percentage",
Expand Down

0 comments on commit fdc814c

Please sign in to comment.