Skip to content

Commit a0f2c7f

Browse files
some refactor
1 parent aa004ae commit a0f2c7f

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

src/status_im2/contexts/wallet/send/transaction_confirmation/view.cljs

+8-11
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
:subtitle "149.99 ETH"}]]])
144144

145145
(defn- f-view-internal
146-
[theme]
146+
[_]
147147
(let [reset-slider? (reagent/atom false)
148148
margin-top (safe-area/get-top)
149149
biometric-auth? true
@@ -165,12 +165,10 @@
165165
{:size 16
166166
:name "New house"
167167
:emoji "🍔"})}]
168-
(fn []
168+
(fn [{:keys [theme]}]
169169
[rn/view {:style {:flex 1}}
170-
[quo/gradient-cover
171-
{:customization-color :purple}]
172-
[rn/view
173-
{:style (style/container margin-top)}
170+
[quo/gradient-cover {:customization-color :purple}]
171+
[rn/view {:style (style/container margin-top)}
174172
[quo/page-nav
175173
{:icon-name :i/arrow-left
176174
:on-press on-close
@@ -182,8 +180,7 @@
182180
[transaction-from status-account-props theme]
183181
[transaction-to user-props theme]
184182
[transaction-details theme]
185-
[rn/safe-area-view
186-
{:style style/slide-button-container}
183+
[rn/view {:style style/slide-button-container}
187184
[quo/slide-button
188185
{:size :size/s-48
189186
:customization-color :purple
@@ -192,8 +189,8 @@
192189
:track-icon (if biometric-auth? :i/face-id :password)
193190
:track-text (i18n/label :t/slide-to-send)}]]]])))
194191

195-
(defn- view-internal
196-
[{:keys [theme]}]
197-
[:f> f-view-internal theme])
192+
(defn view-internal
193+
[props]
194+
[:f> f-view-internal props])
198195

199196
(def view (quo.theme/with-theme view-internal))

src/status_im2/navigation/screens.cljs

+1
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@
298298
:component wallet-select-asset/view}
299299

300300
{:name :wallet-transaction-confirmation
301+
:options {:insets {:bottom? true}}
301302
:component wallet-transaction-confirmation/view}
302303

303304
{:name :scan-address

translations/en.json

-1
Original file line numberDiff line numberDiff line change
@@ -2386,7 +2386,6 @@
23862386
"keypairs": "Keypairs",
23872387
"keypairs-description": "Select keypair to derive your new account from",
23882388
"confirm-account-origin": "Confirm account origin",
2389-
<<<<<<< HEAD
23902389
"address-placeholder": "0x123abc... or bob.eth",
23912390
"invalid-address": "It’s not Ethereum address or ENS name",
23922391
"address-already-in-use": "Address already being used",

0 commit comments

Comments
 (0)