Skip to content

Commit

Permalink
clean
Browse files Browse the repository at this point in the history
  • Loading branch information
J-Son89 committed Dec 21, 2023
1 parent 92bc0b1 commit 83a5e1e
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 62 deletions.
2 changes: 1 addition & 1 deletion src/quo/components/utilities/token/loader.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[token]
(let [token-symbol (cond-> token
(keyword? token) name
:always string/lower-case)]
:always (comp string/lower-case str))]
(get tokens token-symbol)))

(def get-token-image (memoize get-token-image*))
19 changes: 18 additions & 1 deletion src/quo/core_spec.cljs
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
(ns quo.core-spec
(:require
(:require ;; [quo.components.list-items.account.component-spec]
;; [quo.components.list-items.address.component-spec]
;; [quo.components.list-items.address.component-spec]
;; [quo.components.list-items.address.component-spec]
;; [quo.components.list-items.address.component-spec]
;; [quo.components.list-items.saved-address.component-spec]
;; [quo.components.list-items.saved-address.component-spec]
;; [quo.components.list-items.saved-address.component-spec]
;; [quo.components.list-items.saved-address.component-spec]
;; [quo.components.list-items.saved-contact-address.component-spec]
;; [quo.components.list-items.saved-contact-address.component-spec]
;; [quo.components.list-items.saved-contact-address.component-spec]
;; [quo.components.list-items.saved-contact-address.component-spec]
;; [quo.components.list-items.saved-contact-address.component-spec]
;; [quo.components.list-items.saved-contact-address.component-spec]
;; [quo.components.list-items.saved-contact-address.component-spec]
;; [quo.components.list-items.saved-contact-address.component-spec]
;; [quo.components.list-items.token-network.component-spec]
[quo.components.avatars.account-avatar.component-spec]
[quo.components.avatars.user-avatar.component-spec]
[quo.components.banners.banner.component-spec]
Expand Down
3 changes: 1 addition & 2 deletions src/status_im/common/floating_button_page/view.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
:remove-listeners remove-listeners}))

(defn view
[{:keys [header footer customization-color gradient-cover?] :or {customization-color :blue}} &
[{:keys [header footer customization-color gradient-cover?]} &
children]
(reagent/with-let [window-height (:height (rn/get-window))
footer-container-height (reagent/atom 0)
Expand Down Expand Up @@ -83,7 +83,6 @@
:keyboard-shown? keyboard-shown?})]
[:<>
(when gradient-cover? [quo/gradient-cover {:customization-color customization-color}])

[rn/view {:style style/page-container}
[rn/view {:on-layout set-header-height}
header]
Expand Down
3 changes: 1 addition & 2 deletions src/status_im/contexts/wallet/account/view.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
(let [{:keys [name color balance watch-only?]} (rf/sub [:wallet/current-viewing-account])
currency-symbol (rf/sub [:profile/currency-symbol])]
[rn/view {:style {:flex 1}}
[rn/pressable {:on-press #(rf/dispatch [:navigate-to :wallet-transaction-progress])}
[account-switcher/view {:on-press #(rf/dispatch [:wallet/close-account-page])}]]
[account-switcher/view {:on-press #(rf/dispatch [:wallet/close-account-page])}]
[quo/account-overview
{:current-value (utils/prettify-balance currency-symbol balance)
:account-name name
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(ns status-im2.contexts.wallet.send.transaction-progress.style)
(ns status-im.contexts.wallet.send.transaction-progress.style)

(def content-container
{:flex 1
Expand Down
44 changes: 44 additions & 0 deletions src/status_im/contexts/wallet/send/transaction_progress/view.cljs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
(ns status-im.contexts.wallet.send.transaction-progress.view
(:require
[quo.core :as quo]
[react-native.core :as rn]
[react-native.safe-area :as safe-area]
[reagent.core :as reagent]
[status-im.common.floating-button-page.view :as floating-button-page]
[status-im.common.resources :as resources]
[status-im.contexts.wallet.send.transaction-progress.style :as style]
[utils.i18n :as i18n]
[utils.re-frame :as rf]))

(defn titles
[status]
(case status
:sending (i18n/label :t/sending-with-elipsis)
:confirmed (i18n/label :t/transaction-confirmed)
:finalised (i18n/label :t/transacation-finalised)
""))

(defn view
[]
(let [status (reagent/atom :sending)
{:keys [color]} (rf/sub [:wallet/current-viewing-account])]
[floating-button-page/view
{:header [quo/page-nav
{:type :no-title
:background :blur
:icon-name :i/close
:margin-top (safe-area/get-top)
:on-press #(rf/dispatch [:navigate-back])
:accessibility-label :top-bar}]
:footer [quo/button
{:customization-color color
:on-press #(rf/dispatch [:navigate-back])}
(i18n/label :t/done)]
:customization-color color
:gradient-cover? true}
[rn/view {:style style/content-container}
[rn/image
{:source (resources/get-image :transaction-progress)
:style {:margin-bottom 12}}]
[quo/standard-title
{:title (titles @status)}]]]))
55 changes: 0 additions & 55 deletions src/status_im2/contexts/wallet/send/transaction_progress/view.cljs

This file was deleted.

0 comments on commit 83a5e1e

Please sign in to comment.