Skip to content

Commit 0edfa1b

Browse files
fix: swap fees are not displayed if route estimated time is nil
Signed-off-by: Brian Sztamfater <[email protected]>
1 parent a253f8c commit 0edfa1b

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

src/status_im/contexts/wallet/swap/set_spending_cap/view.cljs

+7-8
Original file line numberDiff line numberDiff line change
@@ -202,18 +202,17 @@
202202
:network-image (:source network)}]
203203
[data-item
204204
{:title (i18n/label :t/max-fees)
205-
:subtitle (if (and estimated-time approval-fees-formatted)
205+
:subtitle (if approval-fees-formatted
206206
approval-fees-formatted
207207
(i18n/label :t/unknown))
208208
:loading? loading-swap-proposal?
209209
:size :small}]
210-
[data-item
211-
{:title (i18n/label :t/est-time)
212-
:subtitle (if estimated-time
213-
(i18n/label :t/time-in-mins {:minutes (str estimated-time)})
214-
(i18n/label :t/unknown))
215-
:loading? loading-swap-proposal?
216-
:size :small}]]]))
210+
(when estimated-time
211+
[data-item
212+
{:title (i18n/label :t/est-time)
213+
:subtitle (i18n/label :t/time-in-mins {:minutes (str estimated-time)})
214+
:loading? loading-swap-proposal?
215+
:size :small}])]]))
217216

218217
(defn- slide-button
219218
[]

src/status_im/contexts/wallet/swap/swap_confirmation/view.cljs

+6-7
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,14 @@
148148
max-slippage (rf/sub [:wallet/swap-max-slippage])]
149149
[rn/view {:style style/details-container}
150150
[:<>
151-
[data-item
152-
{:title (i18n/label :t/est-time)
153-
:subtitle (if estimated-time
154-
(i18n/label :t/time-in-mins {:minutes (str estimated-time)})
155-
(i18n/label :t/unknown))
156-
:loading? loading-swap-proposal?}]
151+
(when estimated-time
152+
[data-item
153+
{:title (i18n/label :t/est-time)
154+
:subtitle (i18n/label :t/time-in-mins {:minutes (str estimated-time)})
155+
:loading? loading-swap-proposal?}])
157156
[data-item
158157
{:title (i18n/label :t/max-fees)
159-
:subtitle (if (and estimated-time max-fees-formatted) max-fees-formatted (i18n/label :t/unknown))
158+
:subtitle (if max-fees-formatted max-fees-formatted (i18n/label :t/unknown))
160159
:loading? loading-swap-proposal?}]
161160
[data-item
162161
{:title (i18n/label :t/max-slippage)

0 commit comments

Comments
 (0)