From 8fc853373b956dbc2df4480bd8d50c6cedf4fd1e Mon Sep 17 00:00:00 2001 From: Omar Basem Date: Fri, 11 Nov 2022 15:45:54 +0400 Subject: [PATCH] Rename :main-icons2 to :i (#14335) * chore: rename icons --- .../components/buttons/dynamic_button.cljs | 14 ++--- .../community/community_list_view.cljs | 16 +++--- .../components/community/community_view.cljs | 8 +-- src/quo2/components/info/information_box.cljs | 8 +-- src/quo2/components/list_items/channel.cljs | 6 +-- .../components/list_items/preview_list.cljs | 14 ++--- .../components/navigation/bottom_nav_tab.cljs | 2 +- src/quo2/components/navigation/top_nav.cljs | 8 +-- src/quo2/components/reactions/reaction.cljs | 2 +- src/quo2/components/selectors/selectors.cljs | 4 +- src/quo2/components/tags/permission_tag.cljs | 18 +++---- src/quo2/components/tags/tags.cljs | 4 +- src/quo2/components/tags/token_tag.cljs | 2 +- .../components/wallet/network_amount.cljs | 2 +- .../components/wallet/token_overview.cljs | 4 +- src/status_im/constants.cljs | 12 ++--- src/status_im/switcher/bottom_tabs.cljs | 8 +-- .../switcher_cards/switcher_cards.cljs | 4 +- .../ui/screens/activity_center/views.cljs | 8 +-- .../community_options_bottom_sheet.cljs | 40 +++++++------- .../community_overview_redesign.cljs | 8 +-- ...request_to_join_bottom_sheet_redesign.cljs | 4 +- .../ui/screens/wallet/account/views.cljs | 8 +-- .../ui/screens/wallet/accounts/views.cljs | 6 +-- src/status_im/ui2/screens/chat/actions.cljs | 12 ++--- .../chat/components/contact_item/view.cljs | 6 +-- .../components/message_home_item/view.cljs | 14 ++--- .../ui2/screens/chat/composer/view.cljs | 8 +-- src/status_im/ui2/screens/chat/home.cljs | 4 +- .../ui2/screens/chat/messages/message.cljs | 52 +++++++++---------- .../screens/chat/messages/pinned_message.cljs | 6 +-- .../communities/discover_communities.cljs | 14 ++--- .../screens/quo2_preview/buttons/button.cljs | 8 +-- .../quo2_preview/drawers/action_drawers.cljs | 16 +++--- .../quo2_preview/info/info_message.cljs | 2 +- .../quo2_preview/info/information_box.cljs | 2 +- .../navigation/bottom_nav_tab.cljs | 10 ++-- .../quo2_preview/navigation/page_nav.cljs | 12 ++--- .../quo2_preview/wallet/network_amount.cljs | 8 +-- 39 files changed, 192 insertions(+), 192 deletions(-) diff --git a/src/quo2/components/buttons/dynamic_button.cljs b/src/quo2/components/buttons/dynamic_button.cljs index adbf68c454..6cd00c0a84 100644 --- a/src/quo2/components/buttons/dynamic_button.cljs +++ b/src/quo2/components/buttons/dynamic_button.cljs @@ -22,13 +22,13 @@ (defn- icon-view [type] [icon/icon (case type - :jump-to :main-icons2/jump-to - :mention :main-icons2/mention - :notification-down :main-icons2/arrow-down - :notification-up :main-icons2/arrow-up - :search-with-label :main-icons2/search - :search :main-icons2/search - :bottom :main-icons2/arrow-down) + :jump-to :i/jump-to + :mention :i/mention + :notification-down :i/arrow-down + :notification-up :i/arrow-up + :search-with-label :i/search + :search :i/search + :bottom :i/arrow-down) {:size 12 :color (get-icon-and-text-color type) :container-style {:margin-top 6 diff --git a/src/quo2/components/community/community_list_view.cljs b/src/quo2/components/community/community_list_view.cljs index 1a83963f36..f6d6d5ca23 100644 --- a/src/quo2/components/community/community_list_view.cljs +++ b/src/quo2/components/community/community_list_view.cljs @@ -55,13 +55,13 @@ [counter/counter {:type :default} 5] (= notifications :muted) - [icons/icon :main-icons2/muted {:container-style {:align-items :center - :justify-content :center} - :resize-mode :center - :size 20 - :color (colors/theme-colors - colors/neutral-40 - colors/neutral-50)}]))]]]]) + [icons/icon :i/muted {:container-style {:align-items :center + :justify-content :center} + :resize-mode :center + :size 20 + :color (colors/theme-colors + colors/neutral-40 + colors/neutral-50)}]))]]]]) (defn communities-membership-list-item [props {:keys [name status tokens locked?]}] [rn/view {:margin-bottom 20} @@ -88,4 +88,4 @@ [rn/view {:justify-content :center :margin-right 12} [community-view/permission-tag-container {:locked? locked? - :tokens tokens}]])]]]]) \ No newline at end of file + :tokens tokens}]])]]]]) diff --git a/src/quo2/components/community/community_view.cljs b/src/quo2/components/community/community_view.cljs index 09e75ebe5d..a9a6a3129a 100644 --- a/src/quo2/components/community/community_view.cljs +++ b/src/quo2/components/community/community_view.cljs @@ -25,14 +25,14 @@ [rn/view (if (= type :card-view) (style/card-stats-container) (style/list-stats-container)) - [community-stats {:icon :main-icons2/group + [community-stats {:icon :i/group :members-count "629.2K" ;;TODO here should be formatted value, use money/format-members from outside this component :icon-color icon-color}] - [community-stats {:icon :main-icons2/lightning + [community-stats {:icon :i/lightning :members-count "112.1K" :icon-color icon-color}] (when (= type :card-view) - [community-stats {:icon :main-icons2/placeholder + [community-stats {:icon :i/placeholder :count 4 :icon-color icon-color}])])) @@ -75,4 +75,4 @@ colors/neutral-80) :locked? locked? :tokens tokens - :size 24}]) \ No newline at end of file + :size 24}]) diff --git a/src/quo2/components/info/information_box.cljs b/src/quo2/components/info/information_box.cljs index edaa8859a9..2d2ade34bf 100644 --- a/src/quo2/components/info/information_box.cljs +++ b/src/quo2/components/info/information_box.cljs @@ -78,10 +78,10 @@ [rn/touchable-opacity {:on-press on-close :accessibility-label (str (or id "information-box") "-close-button")} - [quo2.icons/icon :main-icons2/close {:size 12 - :color (get-color :close-button) - :container-style {:margin-top 4 - :margin-left 8}}]])] + [quo2.icons/icon :i/close {:size 12 + :color (get-color :close-button) + :container-style {:margin-top 4 + :margin-left 8}}]])] (when include-button? [quo2.button/button {:type :primary :size 24 diff --git a/src/quo2/components/list_items/channel.cljs b/src/quo2/components/list_items/channel.cljs index bb9c226399..2b535ece58 100644 --- a/src/quo2/components/list_items/channel.cljs +++ b/src/quo2/components/list_items/channel.cljs @@ -38,7 +38,7 @@ [rn/view {:style {:height 20}} (when (and (not locked?) muted?) - [quo2.icons/icon :main-icons2/muted + [quo2.icons/icon :i/muted {:size 20 :no-color true}]) (when (and (not locked?) @@ -51,6 +51,6 @@ (not muted?) (not (pos? (int mentions-count))) unread-messages?) - [quo2.icons/icon :main-icons2/channel-notification + [quo2.icons/icon :i/channel-notification {:size 20 - :no-color true}])]]) \ No newline at end of file + :no-color true}])]]) diff --git a/src/quo2/components/list_items/preview_list.cljs b/src/quo2/components/list_items/preview_list.cljs index 6a13d3c7dc..39cfa3a312 100644 --- a/src/quo2/components/list_items/preview_list.cljs +++ b/src/quo2/components/list_items/preview_list.cljs @@ -70,13 +70,13 @@ colors/neutral-70 override-theme)}} (if (= size 16) - [quo2.icons/icon :main-icons2/more {:size 12 - :color (get-overflow-color - transparent? - colors/white-opa-70 - colors/neutral-50 - colors/neutral-40 - override-theme)}] + [quo2.icons/icon :i/more {:size 12 + :color (get-overflow-color + transparent? + colors/white-opa-70 + colors/neutral-50 + colors/neutral-40 + override-theme)}] [quo2.text/text {:size (if (= size 32) :paragraph-2 :label) :weight :medium :style {:color (get-overflow-color diff --git a/src/quo2/components/navigation/bottom_nav_tab.cljs b/src/quo2/components/navigation/bottom_nav_tab.cljs index 78918ed164..b938c4f590 100644 --- a/src/quo2/components/navigation/bottom_nav_tab.cljs +++ b/src/quo2/components/navigation/bottom_nav_tab.cljs @@ -17,7 +17,7 @@ (defn bottom-nav-tab "[bottom-nav-tab opts] opts - {:icon :main-icons2/communities + {:icon :i/communities :new-notifications? true/false :notification-indicator :unread-dot/:counter :counter-label number diff --git a/src/quo2/components/navigation/top_nav.cljs b/src/quo2/components/navigation/top_nav.cljs index fe76adcbda..9bc77fd74c 100644 --- a/src/quo2/components/navigation/top_nav.cljs +++ b/src/quo2/components/navigation/top_nav.cljs @@ -63,9 +63,9 @@ :right 20 :top 12 :flex-direction :row}} - [base-button :main-icons2/search open-search :open-search-button button-common-props] - [base-button :main-icons2/scan open-scanner :open-scanner-button button-common-props] - [base-button :main-icons2/qr-code show-qr :show-qr-button button-common-props] + [base-button :i/search open-search :open-search-button button-common-props] + [base-button :i/scan open-scanner :open-scanner-button button-common-props] + [base-button :i/qr-code show-qr :show-qr-button button-common-props] [rn/view ;; Keep view instead of "[:<>" to make sure relative ;; position is calculated from this view instead of its parent [hole-view/hole-view {:key new-notifications? ;; Key is required to force removal of holes @@ -78,7 +78,7 @@ :else [{:x 33 :y -7 :width 18 :height 18 :borderRadius 7}])} - [base-button :main-icons2/activity-center open-activity-center + [base-button :i/activity-center open-activity-center :open-activity-center-button button-common-props]] (when new-notifications? (if (= notification-indicator :counter) diff --git a/src/quo2/components/reactions/reaction.cljs b/src/quo2/components/reactions/reaction.cljs index fd1bc0e634..18f4f259d2 100644 --- a/src/quo2/components/reactions/reaction.cljs +++ b/src/quo2/components/reactions/reaction.cljs @@ -26,7 +26,7 @@ :border-color (if dark? colors/neutral-70 colors/neutral-30)})} - [icons/icon :main-icons2/add + [icons/icon :i/add {:size 20 :color (if dark? colors/white diff --git a/src/quo2/components/selectors/selectors.cljs b/src/quo2/components/selectors/selectors.cljs index 6616cc78f1..5218af62e4 100644 --- a/src/quo2/components/selectors/selectors.cljs +++ b/src/quo2/components/selectors/selectors.cljs @@ -39,7 +39,7 @@ [rn/view {:style {:height 20 :width 20}} - [icons/icon :main-icons2/check-small + [icons/icon :i/check-small {:size 20 :color (colors/theme-colors (colors/alpha colors/neutral-100 (if disabled? 0.3 1)) @@ -72,7 +72,7 @@ [rn/view {:style {:height 20 :width 20}} - [icons/icon :main-icons2/check-small + [icons/icon :i/check-small {:size 20 :color colors/white}]])]]]))) diff --git a/src/quo2/components/tags/permission_tag.cljs b/src/quo2/components/tags/permission_tag.cljs index bba801b6cd..2132b891f5 100644 --- a/src/quo2/components/tags/permission_tag.cljs +++ b/src/quo2/components/tags/permission_tag.cljs @@ -36,12 +36,12 @@ colors/neutral-50 colors/neutral-40)}} (str "+" extra-group-count)] - [icons/icon :main-icons2/pending-default {:container-style {:align-items :center - :justify-content :center} - :color (colors/theme-colors - colors/neutral-50 - colors/neutral-40) - :size 12}])]]))) + [icons/icon :i/pending-default {:container-style {:align-items :center + :justify-content :center} + :color (colors/theme-colors + colors/neutral-50 + colors/neutral-40) + :size 12}])]]))) (defn selected-token-count [group] (cond @@ -114,8 +114,8 @@ :justify-content :flex-end} [rn/view {:padding-left (case 32 8 24 6) :padding-right (case size 32 16 24 12)} - [icons/icon (if locked :main-icons2/locked - :main-icons2/unlocked) + [icons/icon (if locked :i/locked + :i/unlocked) {:resize-mode :center :size (case size 32 20 24 16) :color (colors/theme-colors @@ -123,4 +123,4 @@ colors/neutral-40)}]] [tag-tokens {:tokens tokens :size size - :background-color background-color}]]])) \ No newline at end of file + :background-color background-color}]]])) diff --git a/src/quo2/components/tags/tags.cljs b/src/quo2/components/tags/tags.cljs index 5e26426ee4..4a5af4bb14 100644 --- a/src/quo2/components/tags/tags.cljs +++ b/src/quo2/components/tags/tags.cljs @@ -22,7 +22,7 @@ :icon-color icon-color :labelled (if (= type :label) true labelled) :resource (if (= type :icon) - :main-icons2/placeholder + :i/placeholder resource) :on-press #(do (reset! active-tab-id %) - (when on-change (on-change %)))})]])])))) \ No newline at end of file + (when on-change (on-change %)))})]])])))) diff --git a/src/quo2/components/tags/token_tag.cljs b/src/quo2/components/tags/token_tag.cljs index 90a89ee5ec..99b0a0521b 100644 --- a/src/quo2/components/tags/token_tag.cljs +++ b/src/quo2/components/tags/token_tag.cljs @@ -88,7 +88,7 @@ :border-width 1 :right (get-value-from-size size -3.75 -5.75) :bottom (get-value-from-size size (- 32 7.75 4) (- 24 7.75 2))})} - [icons/icon (if is-required :main-icons2/hold :main-icons2/add) + [icons/icon (if is-required :i/hold :i/add) {:no-color true :size 12}]])} (str value " " token)])) diff --git a/src/quo2/components/wallet/network_amount.cljs b/src/quo2/components/wallet/network_amount.cljs index 4a3f90ce87..7d4c5c7d9d 100644 --- a/src/quo2/components/wallet/network_amount.cljs +++ b/src/quo2/components/wallet/network_amount.cljs @@ -9,7 +9,7 @@ opts {:style style ;; extra styles for the container (takes precedence) :network-name \"Mainnet\" ;; shown network name - :icon :main-icons2/ethereum ;; key of icon belonging to the network + :icon :i/ethereum ;; key of icon belonging to the network :eth-value 1.2345678 ;; shown ETH value}" [{:keys [show-right-border? style network-name icon eth-value labels] :as _opts}] [rn/view (merge {:accessibility-label :network-amount diff --git a/src/quo2/components/wallet/token_overview.cljs b/src/quo2/components/wallet/token_overview.cljs index d8baeeaf6a..8f6f7608a0 100644 --- a/src/quo2/components/wallet/token_overview.cljs +++ b/src/quo2/components/wallet/token_overview.cljs @@ -51,7 +51,7 @@ :size :heading-2} (str currency price)] [rn/view {:style {:display :flex :flex-direction :row :margin-top 6 :align-items :center}} - (when (not (zero? direction)) [icons/icon (if (>= direction 0) :main-icons2/price-increase12 :main-icons2/price-decrease12) + (when (not (zero? direction)) [icons/icon (if (>= direction 0) :i/price-increase12 :i/price-decrease12) {:no-color true :width 14 :height 14 @@ -88,7 +88,7 @@ :style {:height 32 :width 32}}]] [rn/view {:style {:display :flex :flex-direction :row :margin-top 6 :align-items :center}} - (when (not (zero? direction)) [icons/icon (if (pos? direction) :main-icons2/price-increase :main-icons2/price-decrease) + (when (not (zero? direction)) [icons/icon (if (pos? direction) :i/price-increase :i/price-decrease) {:no-color true :size 12 :container-style {:margin-right 4}}]) diff --git a/src/status_im/constants.cljs b/src/status_im/constants.cljs index c2ad05dcdb..85a34d09a1 100644 --- a/src/status_im/constants.cljs +++ b/src/status_im/constants.cljs @@ -56,12 +56,12 @@ emoji-reaction-sad (:sad resources/reactions-old) emoji-reaction-angry (:angry resources/reactions-old)}) -(def reactions {emoji-reaction-love :main-icons2/love - emoji-reaction-thumbs-up :main-icons2/thumbs-up - emoji-reaction-thumbs-down :main-icons2/thumbs-down - emoji-reaction-laugh :main-icons2/laugh - emoji-reaction-sad :main-icons2/sad - emoji-reaction-angry :main-icons2/angry}) +(def reactions {emoji-reaction-love :i/love + emoji-reaction-thumbs-up :i/thumbs-up + emoji-reaction-thumbs-down :i/thumbs-down + emoji-reaction-laugh :i/laugh + emoji-reaction-sad :i/sad + emoji-reaction-angry :i/angry}) (def ^:const invitation-state-unknown 0) (def ^:const invitation-state-requested 1) diff --git a/src/status_im/switcher/bottom_tabs.cljs b/src/status_im/switcher/bottom_tabs.cljs index 9ec5114a26..93987f9766 100644 --- a/src/status_im/switcher/bottom_tabs.cljs +++ b/src/status_im/switcher/bottom_tabs.cljs @@ -53,7 +53,7 @@ (load-selected-stack @animation/selected-stack-id) [rn/view {:style (styles/bottom-tabs-container false)} [rn/view {:style (styles/bottom-tabs)} - [bottom-tab :main-icons2/communities :communities-stack shared-values] - [bottom-tab :main-icons2/messages :chats-stack shared-values] - [bottom-tab :main-icons2/wallet :wallet-stack shared-values] - [bottom-tab :main-icons2/browser :browser-stack shared-values]]]) + [bottom-tab :i/communities :communities-stack shared-values] + [bottom-tab :i/messages :chats-stack shared-values] + [bottom-tab :i/wallet :wallet-stack shared-values] + [bottom-tab :i/browser :browser-stack shared-values]]]) diff --git a/src/status_im/switcher/switcher_cards/switcher_cards.cljs b/src/status_im/switcher/switcher_cards/switcher_cards.cljs index 6666163afc..981787b18e 100644 --- a/src/status_im/switcher/switcher_cards/switcher_cards.cljs +++ b/src/status_im/switcher/switcher_cards/switcher_cards.cljs @@ -42,7 +42,7 @@ :size :small :override-theme :dark :label (i18n/label :t/kicked)}] - (:count :permission) [:<>]) ;; Add components for these cases + (:count :permission) [:<>]) ;; Add components for these cases (:audio :community :link :code) ;; Components not available [:<>])]) @@ -103,7 +103,7 @@ (when avatar [rn/view {:style (styles/avatar-container)} [avatar avatar-params type customization-color]]) - [button/button (styles/close-button-props on-close) :main-icons2/close]]])) + [button/button (styles/close-button-props on-close) :i/close]]])) ;; browser Card (defn browser-card [_] diff --git a/src/status_im/ui/screens/activity_center/views.cljs b/src/status_im/ui/screens/activity_center/views.cljs index 8da0545bec..25f01f912f 100644 --- a/src/status_im/ui/screens/activity_center/views.cljs +++ b/src/status_im/ui/screens/activity_center/views.cljs @@ -44,7 +44,7 @@ (conj pressable [activity-logs/activity-log (merge {:title (i18n/label :t/contact-request) - :icon :main-icons2/add-user + :icon :i/add-user :timestamp (datetime/timestamp->relative (:timestamp notification)) :unread? (not (:read notification)) :context [[context-tags/user-avatar-tag @@ -83,7 +83,7 @@ contact (relative (:timestamp notification)) :unread? (not (:read notification)) :context [[context-tags/user-avatar-tag @@ -137,7 +137,7 @@ {:filter-status (if unread-filter-enabled? :read :unread)}])} - :main-icons2/unread])) + :i/unread])) ;; TODO(2022-10-07): The empty state is still under design analysis, so we ;; shouldn't even care about translations at this point. A placeholder box is @@ -201,7 +201,7 @@ :style {:margin-bottom 12 :margin-left screen-padding} :on-press #(>evt [:hide-popover])} - :main-icons2/close] + :i/close] [text/text {:size :heading-1 :weight :semi-bold :style {:padding-horizontal screen-padding diff --git a/src/status_im/ui/screens/communities/community_options_bottom_sheet.cljs b/src/status_im/ui/screens/communities/community_options_bottom_sheet.cljs index 6dc871066c..dfaf99bb01 100644 --- a/src/status_im/ui/screens/communities/community_options_bottom_sheet.cljs +++ b/src/status_im/ui/screens/communities/community_options_bottom_sheet.cljs @@ -8,36 +8,36 @@ [status-im.utils.handlers :refer [evt]] [status-im.communities.core :as communities])) -(def not-joined-options [{:icon :main-icons2/members +(def not-joined-options [{:icon :i/members :label (i18n/label :t/view-members)} - {:icon :main-icons2/bullet-list - :right-icon :main-icons2/chevron-right + {:icon :i/bullet-list + :right-icon :i/chevron-right :label (i18n/label :t/view-community-rules)} - {:icon :main-icons2/add-user + {:icon :i/add-user :label (i18n/label :t/invite-contacts)} - {:icon :main-icons2/qr-code + {:icon :i/qr-code :label (i18n/label :t/show-qr)} - {:icon :main-icons2/share + {:icon :i/share :label (i18n/label :t/share-community)}]) -(def joined-options [{:icon :main-icons2/members +(def joined-options [{:icon :i/members :label (i18n/label :t/view-members)} - {:icon :main-icons2/bullet-list - :right-icon :main-icons2/chevron-right + {:icon :i/bullet-list + :right-icon :i/chevron-right :label (i18n/label :t/view-community-rules)} - {:icon :main-icons2/up-to-date + {:icon :i/up-to-date :label (i18n/label :t/mark-as-read)} - {:icon :main-icons2/muted + {:icon :i/muted :label (i18n/label :t/mute-community) - :right-icon :main-icons2/chevron-right} - {:icon :main-icons2/notifications + :right-icon :i/chevron-right} + {:icon :i/notifications :label (i18n/label :t/community-notification-settings) - :right-icon :main-icons2/chevron-right} - {:icon :main-icons2/add-user + :right-icon :i/chevron-right} + {:icon :i/add-user :label (i18n/label :t/invite-contacts)} - {:icon :main-icons2/qr-code + {:icon :i/qr-code :label (i18n/label :t/show-qr)} - {:icon :main-icons2/share + {:icon :i/share :label (i18n/label :t/share-community)}]) (defn leave-sheet [community] @@ -48,7 +48,7 @@ :weight :semi-bold :size :heading-1} (i18n/label :t/leave-community?)]] - ;; TODO get tag image from community data + ;; TODO get tag image from community data [context-tags/context-tag {:style {:margin-right :auto @@ -73,14 +73,14 @@ :style {:flex 1}} (i18n/label :t/leave-community)]]]) (defn options-menu [] - (let [community-mock (evt [:bottom-sheet/show-sheet {:content (constantly [leave-sheet community]) diff --git a/src/status_im/ui/screens/communities/community_overview_redesign.cljs b/src/status_im/ui/screens/communities/community_overview_redesign.cljs index 6a43636d4e..ec008fa0c1 100644 --- a/src/status_im/ui/screens/communities/community_overview_redesign.cljs +++ b/src/status_im/ui/screens/communities/community_overview_redesign.cljs @@ -96,14 +96,14 @@ :page-nav-color :transparent :page-nav-background-uri "" :mid-section {:type :text-with-description} - :right-section-buttons [{:icon :main-icons2/search + :right-section-buttons [{:icon :i/search :background-color (icon-color)} - {:icon :main-icons2/options + {:icon :i/options :background-color (icon-color) :on-press #(>evt [:bottom-sheet/show-sheet {:content (constantly [options-menu/options-menu community]) :content-height 400}])}] - :left-section {:icon :main-icons2/close + :left-section {:icon :i/close :icon-background-color (icon-color) :on-press #(>evt [:navigate-back])}}]]] [rn/view {:flex 1 @@ -156,7 +156,7 @@ :margin-top 20 :margin-left :auto :margin-right :auto} - :before :main-icons2/communities} + :before :i/communities} (i18n/label :join-open-community)])] [channel-list-component]]]) diff --git a/src/status_im/ui/screens/communities/request_to_join_bottom_sheet_redesign.cljs b/src/status_im/ui/screens/communities/request_to_join_bottom_sheet_redesign.cljs index 8561312f41..e0efa3d019 100644 --- a/src/status_im/ui/screens/communities/request_to_join_bottom_sheet_redesign.cljs +++ b/src/status_im/ui/screens/communities/request_to_join_bottom_sheet_redesign.cljs @@ -98,8 +98,8 @@ :border-radius 8 :display :flex :justify-content :center}} - [icon/icon :main-icons2/info]]] - ;; TODO get tag image from community data + [icon/icon :i/info]]] + ;; TODO get tag image from community data [context-tags/context-tag {:style {:margin-right :auto diff --git a/src/status_im/ui/screens/wallet/account/views.cljs b/src/status_im/ui/screens/wallet/account/views.cljs index 35aecfc3da..d3253f51f5 100644 --- a/src/status_im/ui/screens/wallet/account/views.cljs +++ b/src/status_im/ui/screens/wallet/account/views.cljs @@ -268,13 +268,13 @@ [react/view [react/scroll-view {:horizontal true :margin-bottom 32 :showsHorizontalScrollIndicator false} [react/view {:width 20}] - [quo2.button/button {:size 56 :width button-width :above :main-icons2/placeholder} "Buy"] + [quo2.button/button {:size 56 :width button-width :above :i/placeholder} "Buy"] [react/view {:width 12}] - [quo2.button/button {:size 56 :width button-width :type :secondary :above :main-icons2/placeholder} "Send"] + [quo2.button/button {:size 56 :width button-width :type :secondary :above :i/placeholder} "Send"] [react/view {:width 12}] - [quo2.button/button {:size 56 :width button-width :type :secondary :above :main-icons2/placeholder} "Receive"] + [quo2.button/button {:size 56 :width button-width :type :secondary :above :i/placeholder} "Receive"] [react/view {:width 12}] - [quo2.button/button {:size 56 :width button-width :type :secondary :above :main-icons2/placeholder} "Swap"] + [quo2.button/button {:size 56 :width button-width :type :secondary :above :i/placeholder} "Swap"] [react/view {:width 20}]]] [assets-and-collections-new selected-account]])) diff --git a/src/status_im/ui/screens/wallet/accounts/views.cljs b/src/status_im/ui/screens/wallet/accounts/views.cljs index 42fcfdfde2..0791e985d9 100644 --- a/src/status_im/ui/screens/wallet/accounts/views.cljs +++ b/src/status_im/ui/screens/wallet/accounts/views.cljs @@ -280,7 +280,7 @@ :on-press #(re-frame/dispatch [::qr-scanner/scan-code {:handler :wallet.send/qr-scanner-result}])} - :main-icons2/placeholder] + :i/placeholder] [react/view {:width 12}] [quo2.button/button {:icon true :size 32 @@ -288,7 +288,7 @@ :on-press #(re-frame/dispatch [:bottom-sheet/show-sheet {:content (sheets/accounts-options mnemonic)}]) :accessibility-label :accounts-more-options} - :main-icons2/placeholder]] + :i/placeholder]] [total-value] [accounts selected-account-atom]] [account.views/account-new @selected-account-atom]])]))) @@ -318,4 +318,4 @@ [buy-crypto/banner]) [assets] [react/view {:height 68}]] - [send-button]])) \ No newline at end of file + [send-button]])) diff --git a/src/status_im/ui2/screens/chat/actions.cljs b/src/status_im/ui2/screens/chat/actions.cljs index 7261506a82..32cd26292d 100644 --- a/src/status_im/ui2/screens/chat/actions.cljs +++ b/src/status_im/ui2/screens/chat/actions.cljs @@ -44,7 +44,7 @@ (hide-sheet-and-dispatch [:chat.ui/remove-chat-pressed chat-id])) (defn mute-chat-entry [muted? chat-id] - (entry :main-icons2/muted + (entry :i/muted (i18n/label (if muted? :unmute-chat @@ -55,31 +55,31 @@ false)) (defn mark-as-read-entry [chat-id] - (entry :main-icons2/check + (entry :i/check (i18n/label :mark-as-read) #(mark-all-read-action chat-id) false)) (defn clear-history-entry [chat-id] - (entry :main-icons2/delete + (entry :i/delete (i18n/label :clear-history) #(clear-history-action chat-id) true)) (defn delete-chat-entry [chat-id] - (entry :main-icons2/delete + (entry :i/delete (i18n/label :delete-chat) #(delete-chat-action chat-id) true)) (defn view-profile-entry [chat-id] - (entry :main-icons2/friend + (entry :i/friend (i18n/label :view-profile) #(show-profile-action chat-id) false)) (defn edit-nickname-entry [chat-id] - (entry :main-icons2/edit + (entry :i/edit (i18n/label :edit-nickname) #(edit-nickname-action chat-id) false)) diff --git a/src/status_im/ui2/screens/chat/components/contact_item/view.cljs b/src/status_im/ui2/screens/chat/components/contact_item/view.cljs index e8718c8b66..89c2751a89 100644 --- a/src/status_im/ui2/screens/chat/components/contact_item/view.cljs +++ b/src/status_im/ui2/screens/chat/components/contact_item/view.cljs @@ -37,15 +37,15 @@ display-name] (if ens-verified [rn/view {:style {:margin-left 5 :margin-top 4}} - [icons/icon :main-icons2/verified {:no-color true :size 12 :color (colors/theme-colors colors/success-50 colors/success-60)}]] + [icons/icon :i/verified {:no-color true :size 12 :color (colors/theme-colors colors/success-50 colors/success-60)}]] (when added? [rn/view {:style {:margin-left 5 :margin-top 4}} - [icons/icon :main-icons2/contact {:no-color true :size 12 :color (colors/theme-colors colors/primary-50 colors/primary-60)}]]))] + [icons/icon :i/contact {:no-color true :size 12 :color (colors/theme-colors colors/primary-50 colors/primary-60)}]]))] [text/text {:size :paragraph-1 :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}} (get-shortened-address public-key)]] [rn/touchable-opacity {:style {:position :absolute :right 20} :active-opacity 1} ; TODO: on-long-press to be added when contact bottom sheet is implemented - [icons/icon :main-icons2/options {:size 20 :color (colors/theme-colors colors/primary-50 colors/primary-60)}]]])) + [icons/icon :i/options {:size 20 :color (colors/theme-colors colors/primary-50 colors/primary-60)}]]])) diff --git a/src/status_im/ui2/screens/chat/components/message_home_item/view.cljs b/src/status_im/ui2/screens/chat/components/message_home_item/view.cljs index 89951940c9..16c0b2c32b 100644 --- a/src/status_im/ui2/screens/chat/components/message_home_item/view.cljs +++ b/src/status_im/ui2/screens/chat/components/message_home_item/view.cljs @@ -69,14 +69,14 @@ (defn verified-or-contact-icon [{:keys [ens-verified added?]}] (if ens-verified [rn/view {:style {:margin-left 5 :margin-top 4}} - [icons/icon :main-icons2/verified {:no-color true - :size 12 - :color (colors/theme-colors colors/success-50 colors/success-60)}]] + [icons/icon :i/verified {:no-color true + :size 12 + :color (colors/theme-colors colors/success-50 colors/success-60)}]] (when added? [rn/view {:style {:margin-left 5 :margin-top 4}} - [icons/icon :main-icons2/contact {:no-color true - :size 12 - :color (colors/theme-colors colors/primary-50 colors/primary-60)}]]))) + [icons/icon :i/contact {:no-color true + :size 12 + :color (colors/theme-colors colors/primary-50 colors/primary-60)}]]))) (defn display-name-view [display-name contact timestamp] [rn/view {:style {:flex-direction :row}} @@ -90,7 +90,7 @@ (defn display-pic-view [group-chat color display-name photo-path] (if group-chat [rn/view {:style (style/group-chat-icon color)} - [icons/icon :main-icons2/group {:size 16 :color colors/white-opa-70}]] + [icons/icon :i/group {:size 16 :color colors/white-opa-70}]] [user-avatar/user-avatar {:full-name display-name :profile-picture photo-path :status-indicator? true diff --git a/src/status_im/ui2/screens/chat/composer/view.cljs b/src/status_im/ui2/screens/chat/composer/view.cljs index 95677153b3..fbd1c35011 100644 --- a/src/status_im/ui2/screens/chat/composer/view.cljs +++ b/src/status_im/ui2/screens/chat/composer/view.cljs @@ -176,9 +176,9 @@ ;CONTROLS (when-not (seq suggestions) [rn/view {:style (styles/bottom-sheet-controls insets)} - [quo2.button/button {:icon true :type :outline :size 32} :main-icons2/image] + [quo2.button/button {:icon true :type :outline :size 32} :i/image] [rn/view {:width 12}] - [quo2.button/button {:icon true :type :outline :size 32} :main-icons2/reaction] + [quo2.button/button {:icon true :type :outline :size 32} :i/reaction] [rn/view {:flex 1}] ;;SEND button [rn/view {:ref send-ref :style (when-not (seq (get @input/input-texts chat-id)) {:width 0 :right -100})} @@ -186,9 +186,9 @@ :on-press #(do (swap! context assoc :clear true) (input/clear-input chat-id refs) (re-frame/dispatch [:chat.ui/send-current-message]))} - :main-icons2/arrow-up]]]) + :i/arrow-up]]]) ;black background [reanimated/view {:style (reanimated/apply-animations-to-style {:opacity bg-opacity} (styles/bottom-sheet-background window-height))}] - [mentions/autocomplete-mentions suggestions]]))])))]) \ No newline at end of file + [mentions/autocomplete-mentions suggestions]]))])))]) diff --git a/src/status_im/ui2/screens/chat/home.cljs b/src/status_im/ui2/screens/chat/home.cljs index bd45318a0f..bae7b8d997 100644 --- a/src/status_im/ui2/screens/chat/home.cljs +++ b/src/status_im/ui2/screens/chat/home.cljs @@ -180,7 +180,7 @@ :justify-content :center :align-items :center :margin-bottom 24}} - [quo2.icons/icon :main-icons2/close {:color (colors/theme-colors "#000000" "#ffffff")}]] + [quo2.icons/icon :i/close {:color (colors/theme-colors "#000000" "#ffffff")}]] [rn/text {:style (merge typography/heading-1 typography/font-semi-bold @@ -235,7 +235,7 @@ :border-radius 16 :border-width 1 :border-color (colors/theme-colors colors/neutral-20 colors/neutral-80)}} - [quo2.icons/icon :main-icons2/pending-user {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}]] + [quo2.icons/icon :i/pending-user {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}]] [rn/view {:style {:margin-left 8}} [rn/text {:style (merge typography/paragraph-1 typography/font-semi-bold {:color (colors/theme-colors "#000000" "#ffffff")})} (i18n/label :t/pending-requests)] diff --git a/src/status_im/ui2/screens/chat/messages/message.cljs b/src/status_im/ui2/screens/chat/messages/message.cljs index eb2fe188c2..14fc62e037 100644 --- a/src/status_im/ui2/screens/chat/messages/message.cljs +++ b/src/status_im/ui2/screens/chat/messages/message.cljs @@ -211,7 +211,7 @@ [rn/text {:style style/not-sent-text} (i18n/label :t/status-not-sent-tap)] [rn/view style/not-sent-icon - [icons/icon :main-icons2/warning {:color quo.colors/red}]]]]) + [icons/icon :i/warning {:color quo.colors/red}]]]]) (defn pin-author-name [pinned-by] (let [user-contact @(re-frame/subscribe [:multiaccount/contact]) @@ -220,9 +220,9 @@ (str " " (if (= pinned-by (user-contact :public-key)) (i18n/label :t/You) (first contact-names))))) (defn pin-icon [color size] - [icons/icon :main-icons2/pin {:color color - :height size - :width size}]) + [icons/icon :i/pin {:color color + :height size + :width size}]) (defn pinned-by-indicator [pinned-by] [rn/view {:style (style/pin-indicator) @@ -380,7 +380,7 @@ (merge (dissoc style-opts :opacity) {:flex 1 :align-items :center :justify-content :center :position :absolute}) (if (:error @dimensions) - [icons/icon :main-icons2/cancel] + [icons/icon :i/cancel] [rn/activity-indicator {:animating true}])]) [fast-image/fast-image {:style (dissoc style-opts :outgoing) :on-load (image-set-size dimensions) @@ -413,26 +413,26 @@ [{:type :main :on-press #(re-frame/dispatch [:chat.ui/edit-message message]) :label (i18n/label :t/edit-message) - :icon :main-icons2/edit + :icon :i/edit :id :edit}]) (when show-input? [{:type :main :on-press #(re-frame/dispatch [:chat.ui/reply-to-message message]) :label (i18n/label :t/message-reply) - :icon :main-icons2/reply + :icon :i/reply :id :reply}]) [{:type :main :on-press #(react/copy-to-clipboard (components.reply/get-quoted-text-with-mentions (get content :parsed-text))) :label (i18n/label :t/copy-text) - :icon :main-icons2/copy + :icon :i/copy :id :copy}] (when message-pin-enabled [{:type :main :on-press #(pin-message message) :label (i18n/label (if pinned (if community? :t/unpin-from-channel :t/unpin-from-chat) (if community? :t/pin-to-channel :t/pin-to-chat))) - :icon :main-icons2/pin + :icon :i/pin :id (if pinned :unpin :pin)}]) [{:type :danger :on-press (fn [] @@ -441,7 +441,7 @@ [:chat.ui/delete-message-for-me message config/delete-message-for-me-undo-time-limit-ms])) :label (i18n/label :t/delete-for-me) - :icon :main-icons2/delete + :icon :i/delete :id :delete-for-me}] (when (and outgoing config/delete-message-enabled?) [{:type :danger @@ -449,7 +449,7 @@ (when pinned (pin-message message)) (re-frame/dispatch [:chat.ui/soft-delete-message message])) :label (i18n/label :t/delete-for-everyone) - :icon :main-icons2/delete + :icon :i/delete :id :delete-for-all}])))) (defn collapsible-text-message [_ _] @@ -505,17 +505,17 @@ [{:type :main :on-press #(re-frame/dispatch [:chat.ui/reply-to-message message]) :id :reply - :icon :main-icons2/reply-context20 + :icon :i/reply-context20 :label (i18n/label :t/message-reply)} {:type :main :on-press #(react/copy-to-clipboard (get content :text)) :id :copy - :icon :main-icons2/copy-context20 + :icon :i/copy-context20 :label (i18n/label :t/copy-text)}] (when message-pin-enabled [{:type :main :on-press #(pin-message message) :id :pin - :icon :main-icons2/pin-context20 + :icon :i/pin-context20 :label (if pinned (i18n/label :t/unpin) (i18n/label :t/pin))}]))))] (reset! ref on-long-press) [message-content-wrapper message @@ -546,7 +546,7 @@ (on-long-press (when-not outgoing [{:type :main - :icon :main-icons2/stickers-context20 + :icon :i/stickers-context20 :on-press #(when pack (re-frame/dispatch [:chat.ui/show-profile from])) :label (i18n/label :t/see-sticker-set)}])))] @@ -574,31 +574,31 @@ (concat [{:type :main :on-press #(re-frame/dispatch [:chat.ui/reply-to-message message]) :id :reply - :icon :main-icons2/reply-context20 + :icon :i/reply-context20 :label (i18n/label :t/message-reply)} {:type :main :on-press #(re-frame/dispatch [:chat.ui/save-image-to-gallery (:image content)]) :id :save - :icon :main-icons2/save-context20 + :icon :i/save-context20 :label (i18n/label :t/save-image-library)} {:type :main :on-press #(images/download-image-http (get-in message [:content :image]) preview/share) :id :share - :icon :main-icons2/share-context20 + :icon :i/share-context20 :label (i18n/label :t/share-image)}] [{:type :danger :on-press #(re-frame/dispatch [:chat.ui/delete-message-for-me message config/delete-message-for-me-undo-time-limit-ms]) :label (i18n/label :t/delete-for-me) - :icon :main-icons2/delete-context20 + :icon :i/delete-context20 :id :delete-for-me}] (when (and outgoing config/delete-message-enabled?) [{:type :danger :on-press #(re-frame/dispatch [:chat.ui/soft-delete-message message]) :label (i18n/label :t/delete-for-everyone) - :icon :main-icons2/delete-context20 + :icon :i/delete-context20 :id :delete}]))))] (reset! ref on-long-press) [message-content-wrapper message @@ -617,25 +617,25 @@ (let [on-long-press (fn [] (on-long-press [{:type :main :on-press #(re-frame/dispatch [:chat.ui/reply-to-message message]) :label (i18n/label :t/message-reply) - :icon :main-icons2/reply + :icon :i/reply :id :reply} {:type :main :on-press #(pin-message message) :label (i18n/label (if pinned :t/unpin-from-chat :t/pin-to-chat)) - :icon :main-icons2/pin-context20 + :icon :i/pin-context20 :id (if pinned :unpin :pin)} {:type :danger :on-press #(re-frame/dispatch [:chat.ui/delete-message-for-me message config/delete-message-for-me-undo-time-limit-ms]) :label (i18n/label :t/delete-for-me) - :icon :main-icons2/delete-context20 + :icon :i/delete-context20 :id :delete-for-me} (when (and outgoing config/delete-message-enabled?) {:type :danger :on-press #(re-frame/dispatch [:chat.ui/soft-delete-message message]) :label (i18n/label :t/delete-for-everyone) - :icon :main-icons2/delete-context20 + :icon :i/delete-context20 :id :delete})]))] (reset! ref on-long-press) [message-content-wrapper message @@ -780,7 +780,7 @@ [chat-icon/chat-icon-view-toolbar chat-id (:group-chat current-chat) (:chat-name current-chat) (:color current-chat) (:emoji current-chat) 22] [rn/text {:style {:margin-left 6 :margin-right 4 :color (colors/theme-colors colors/neutral-100 colors/white)}} (:name community)] [icons/icon - :main-icons2/chevron-right + :i/chevron-right {:color (colors/theme-colors colors/neutral-50 colors/neutral-40) :width 12 :height 12}] @@ -801,7 +801,7 @@ :height 120 :justify-content :center :align-items :center - :border-width 1}} [icons/icon :main-icons2/placeholder]] + :border-width 1}} [icons/icon :i/placeholder]] [rn/text {:style (merge typography/paragraph-1 typography/font-semi-bold {:margin-top 20})} (i18n/label :t/no-pinned-messages)] [rn/text {:style (merge typography/paragraph-2 typography/font-regular)} (i18n/label (if community :t/no-pinned-messages-community-desc :t/no-pinned-messages-desc))]])])) diff --git a/src/status_im/ui2/screens/chat/messages/pinned_message.cljs b/src/status_im/ui2/screens/chat/messages/pinned_message.cljs index c03f959fcf..44daccab15 100644 --- a/src/status_im/ui2/screens/chat/messages/pinned_message.cljs +++ b/src/status_im/ui2/screens/chat/messages/pinned_message.cljs @@ -47,6 +47,6 @@ :style {:position :absolute :top 16 :right 16}} - [icons/icon :main-icons2/close {:color (colors/theme-colors colors/white colors/neutral-100) - :height 8 - :width 8}]]]))]) + [icons/icon :i/close {:color (colors/theme-colors colors/white colors/neutral-100) + :height 8 + :width 8}]]]))]) diff --git a/src/status_im/ui2/screens/communities/discover_communities.cljs b/src/status_im/ui2/screens/communities/discover_communities.cljs index 9c6f2a1f21..6dcd8f845c 100644 --- a/src/status_im/ui2/screens/communities/discover_communities.cljs +++ b/src/status_im/ui2/screens/communities/discover_communities.cljs @@ -96,13 +96,13 @@ :style {:margin-right 6}} (i18n/label :t/featured)] [quo2.counter/counter @count (:value @count)]] - [icons/icon :main-icons2/info {:container-style {:align-items :center - :justify-content :center} - :resize-mode :center - :size 20 - :color (colors/theme-colors - colors/neutral-50 - colors/neutral-40)}]] + [icons/icon :i/info {:container-style {:align-items :center + :justify-content :center} + :resize-mode :center + :size 20 + :color (colors/theme-colors + colors/neutral-50 + colors/neutral-40)}]] [rn/view {:margin-top 8 :padding-left 20} [featured-communities communities]]])) diff --git a/src/status_im/ui2/screens/quo2_preview/buttons/button.cljs b/src/status_im/ui2/screens/quo2_preview/buttons/button.cljs index 96e853249d..58405a4555 100644 --- a/src/status_im/ui2/screens/quo2_preview/buttons/button.cljs +++ b/src/status_im/ui2/screens/quo2_preview/buttons/button.cljs @@ -74,12 +74,12 @@ :theme :before :after) {:on-press #(println "Hello world!")} (when @above - {:above :main-icons2/placeholder}) + {:above :i/placeholder}) (when @before - {:before :main-icons2/placeholder}) + {:before :i/placeholder}) (when @after - {:after :main-icons2/placeholder})) - (if @icon :main-icons2/placeholder @label)]]]]))) + {:after :i/placeholder})) + (if @icon :i/placeholder @label)]]]]))) (defn preview-button [] [rn/view {:background-color (colors/theme-colors colors/white colors/neutral-90) diff --git a/src/status_im/ui2/screens/quo2_preview/drawers/action_drawers.cljs b/src/status_im/ui2/screens/quo2_preview/drawers/action_drawers.cljs index 79b0e4da89..86deff4ab5 100644 --- a/src/status_im/ui2/screens/quo2_preview/drawers/action_drawers.cljs +++ b/src/status_im/ui2/screens/quo2_preview/drawers/action_drawers.cljs @@ -14,23 +14,23 @@ :key :show-red-options? :type :boolean}]) -(def options-with-consequences [{:icon :main-icons2/delete +(def options-with-consequences [{:icon :i/delete :danger? true :label "Clear history"}]) (defn render-action-sheet [state] - [quo2/action-drawer (cond-> [[{:icon :main-icons2/friend + [quo2/action-drawer (cond-> [[{:icon :i/friend :label "View channel members and details"} - {:icon :main-icons2/communities + {:icon :i/communities :label "Mark as read"} - {:icon :main-icons2/muted + {:icon :i/muted :label (if (:muted? @state) "Unmute channel" "Mute channel") - :right-icon :main-icons2/chevron-right + :right-icon :i/chevron-right :sub-label (when (:muted? @state) "Muted for 15 min")} - {:icon :main-icons2/scan - :right-icon :main-icons2/chevron-right + {:icon :i/scan + :right-icon :i/chevron-right :label "Fetch messages"} - {:icon :main-icons2/add-user + {:icon :i/add-user :label "Share link to the channel"}]] (:show-red-options? @state) diff --git a/src/status_im/ui2/screens/quo2_preview/info/info_message.cljs b/src/status_im/ui2/screens/quo2_preview/info/info_message.cljs index ab10dfa093..e7a878bc9f 100644 --- a/src/status_im/ui2/screens/quo2_preview/info/info_message.cljs +++ b/src/status_im/ui2/screens/quo2_preview/info/info_message.cljs @@ -28,7 +28,7 @@ (defn cool-preview [] (let [state (reagent/atom {:type :default :size :default - :icon :main-icons2/placeholder + :icon :i/placeholder :message "This is a message"})] (fn [] [rn/touchable-without-feedback {:on-press rn/dismiss-keyboard!} diff --git a/src/status_im/ui2/screens/quo2_preview/info/information_box.cljs b/src/status_im/ui2/screens/quo2_preview/info/information_box.cljs index 4b40c20957..dad659656b 100644 --- a/src/status_im/ui2/screens/quo2_preview/info/information_box.cljs +++ b/src/status_im/ui2/screens/quo2_preview/info/information_box.cljs @@ -27,7 +27,7 @@ (defn cool-preview [] (let [state (reagent/atom {:type :default :closable? true - :icon :main-icons2/placeholder + :icon :i/placeholder :message "This is an information box This is an information" :button-label "Press Me" :style {:width 335} diff --git a/src/status_im/ui2/screens/quo2_preview/navigation/bottom_nav_tab.cljs b/src/status_im/ui2/screens/quo2_preview/navigation/bottom_nav_tab.cljs index 3403ab7d55..476679838d 100644 --- a/src/status_im/ui2/screens/quo2_preview/navigation/bottom_nav_tab.cljs +++ b/src/status_im/ui2/screens/quo2_preview/navigation/bottom_nav_tab.cljs @@ -9,13 +9,13 @@ (def descriptor [{:label "Type" :key :icon :type :select - :options [{:key :main-icons2/communities + :options [{:key :i/communities :value "Communities"} - {:key :main-icons2/messages + {:key :i/messages :value "Messages"} - {:key :main-icons2/wallet + {:key :i/wallet :value "Wallet"} - {:key :main-icons2/browser + {:key :i/browser :value "Browser"}]} {:label "Selected?" :key :selected? @@ -44,7 +44,7 @@ :else colors/neutral-50)) (defn cool-preview [] - (let [state (reagent/atom {:icon :main-icons2/communities + (let [state (reagent/atom {:icon :i/communities :new-notifications? true :notification-indicator :counter :counter-label 8 diff --git a/src/status_im/ui2/screens/quo2_preview/navigation/page_nav.cljs b/src/status_im/ui2/screens/quo2_preview/navigation/page_nav.cljs index da3256ab13..818e7ff173 100644 --- a/src/status_im/ui2/screens/quo2_preview/navigation/page_nav.cljs +++ b/src/status_im/ui2/screens/quo2_preview/navigation/page_nav.cljs @@ -44,7 +44,7 @@ (let [right-icon {:background-color (if (colors/dark?) colors/neutral-80 colors/neutral-20) - :icon :main-icons2/placeholder + :icon :i/placeholder :icon-color nil} base-props {:horizontal-description? true :one-icon-align-left? true @@ -52,16 +52,16 @@ :page-nav-color :transparent :page-nav-background-uri "" :mid-section {:type :text-with-description - :icon :main-icons2/placeholder + :icon :i/placeholder :main-text "Status" - :left-icon :main-icons2/placeholder - :right-icon :main-icons2/placeholder + :left-icon :i/placeholder + :right-icon :i/placeholder :description "SNT" :description-color "black" - :description-icon :main-icons2/placeholder + :description-icon :i/placeholder :description-user-icon "https://i.picsum.photos/id/810/200/300.jpg?hmac=HgwlXd-OaLOAqhGyCiZDUb_75EgUI4u0GtS7nfgxd8s"} :left-section - {:icon :main-icons2/unlocked + {:icon :i/unlocked :icon-background-color (if (colors/dark?) colors/neutral-80 colors/neutral-20)}} diff --git a/src/status_im/ui2/screens/quo2_preview/wallet/network_amount.cljs b/src/status_im/ui2/screens/quo2_preview/wallet/network_amount.cljs index cddc334cad..13d3d81230 100644 --- a/src/status_im/ui2/screens/quo2_preview/wallet/network_amount.cljs +++ b/src/status_im/ui2/screens/quo2_preview/wallet/network_amount.cljs @@ -8,10 +8,10 @@ [clojure.string :as string])) (def ^:private networks - [{:icon :main-icons2/ethereum :name "Mainnet"} - {:icon :main-icons2/arbitrum :name "Arbitrum"} - {:icon :main-icons2/optimism :name "Optimism"} - {:icon :main-icons2/zksync :name "zkSync"}]) + [{:icon :i/ethereum :name "Mainnet"} + {:icon :i/arbitrum :name "Arbitrum"} + {:icon :i/optimism :name "Optimism"} + {:icon :i/zksync :name "zkSync"}]) (defn- networks->options [networks] (for [{:keys [name]