Skip to content

Commit 366f994

Browse files
committed
wallet illustrations
1 parent 2e0643f commit 366f994

31 files changed

+65
-34
lines changed

ios/Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ SPEC CHECKSUMS:
765765
RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
766766
RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
767767
RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
768-
RNReanimated: 42f56dc5c032a11177b9ea12cdb57285318b432e
768+
RNReanimated: 06a228c5a245ef7b5b03f0efc29d76ce4db9031c
769769
RNShare: d82e10f6b7677f4b0048c23709bd04098d5aee6c
770770
RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
771771
RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
8.7 KB
Loading
15.9 KB
Loading
8.69 KB
Loading
15.9 KB
Loading
14.2 KB
Loading
22.7 KB
Loading
15.8 KB
Loading
25 KB
Loading
12.6 KB
Loading
23.1 KB
Loading
12.1 KB
Loading
22.1 KB
Loading
61.2 KB
Loading
114 KB
Loading
40.2 KB
Loading
74.6 KB
Loading
16.5 KB
Loading
29.8 KB
Loading
16.7 KB
Loading
30.2 KB
Loading

src/quo/components/graph/wallet_graph/style.cljs

+4
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@
1919
:background-color colors/danger-50
2020
:align-items :center
2121
:justify-content :center})
22+
23+
(def empty-state
24+
{:width 375
25+
:height 116})

src/quo/components/graph/wallet_graph/view.cljs

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
[quo.components.graph.wallet-graph.style :as style]
55
[quo.components.markdown.text :as text]
66
[quo.foundations.colors :as colors]
7+
[quo.foundations.resources :as resources]
78
[quo.theme :as quo.theme]
89
[react-native.charts :as charts]
910
[react-native.core :as rn]
11+
[react-native.fast-image :as fast-image]
1012
[react-native.linear-gradient :as linear-gradient]))
1113

1214
(defn- time-frame->max-data-points
@@ -42,11 +44,10 @@
4244
gradient-colors [(colors/alpha line-color 0.1) (colors/alpha line-color 0)]
4345
fill-color (colors/theme-colors colors/white colors/neutral-95)]
4446
(if (= time-frame :empty)
45-
[rn/view
46-
{:accessibility-label :illustration
47-
:style style/illustration}
48-
[text/text {:style {:color colors/white}}
49-
"Illustration here"]]
47+
[fast-image/fast-image
48+
{:style style/empty-state
49+
:source (resources/get-image
50+
(quo.theme/theme-value :no-funds-light :no-funds-dark theme))}]
5051
[rn/view
5152
[linear-gradient/linear-gradient
5253
{:colors gradient-colors

src/quo/foundations/resources.cljs

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
:keycard-chip-light (js/require "../resources/images/ui2/keycard-chip-light.png")
66
:keycard-chip-dark (js/require "../resources/images/ui2/keycard-chip-dark.png")
77
:keycard-watermark (js/require "../resources/images/ui2/keycard-watermark.png")
8-
:bored-ape (js/require "../resources/images/mock2/bored-ape.png")})
8+
:bored-ape (js/require "../resources/images/mock2/bored-ape.png")
9+
:no-funds
10+
{:light (js/require "../resources/images/ui2/no-funds-light.png")
11+
:dark (js/require "../resources/images/ui2/no-funds-dark.png")}})
912

1013
(defn get-image
1114
[k]

src/status_im2/common/resources.cljs

+13-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,19 @@
7979
:dark (js/require "../resources/images/ui2/no-contacts-to-invite-dark.png")}
8080
:no-notifications
8181
{:light (js/require "../resources/images/ui2/no-notifications-light.png")
82-
:dark (js/require "../resources/images/ui2/no-notifications-dark.png")}})
82+
:dark (js/require "../resources/images/ui2/no-notifications-dark.png")}
83+
:no-activity
84+
{:light (js/require "../resources/images/ui2/no-activity-light.png")
85+
:dark (js/require "../resources/images/ui2/no-activity-dark.png")}
86+
:no-collectibles
87+
{:light (js/require "../resources/images/ui2/no-collectibles-light.png")
88+
:dark (js/require "../resources/images/ui2/no-collectibles-dark.png")}
89+
:no-dapps
90+
{:light (js/require "../resources/images/ui2/no-dapps-light.png")
91+
:dark (js/require "../resources/images/ui2/no-dapps-dark.png")}
92+
:no-permissions
93+
{:light (js/require "../resources/images/ui2/no-permissions-light.png")
94+
:dark (js/require "../resources/images/ui2/no-permissions-dark.png")}})
8395

8496
(def mock-images
8597
{:bored-ape (js/require "../resources/images/mock2/bored-ape.png")

src/status_im2/contexts/wallet/account/tabs/dapps/view.cljs

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[quo.core :as quo]
44
[quo.theme :as quo.theme]
55
[react-native.core :as rn]
6+
[status-im2.common.resources :as resources]
67
[status-im2.contexts.wallet.account.tabs.dapps.style :as style]
78
[status-im2.contexts.wallet.common.empty-tab.view :as empty-tab]
89
[status-im2.contexts.wallet.common.temp :as temp]
@@ -23,13 +24,13 @@
2324

2425
(defn- view-internal
2526
[{:keys [theme]}]
26-
(let [dapps-list (temp/dapps-list {:on-press-icon #(rf/dispatch [:show-bottom-sheet
27-
{:content dapp-options}])})]
27+
(let [dapps-list []]
2828
(if (empty? dapps-list)
2929
[empty-tab/view
30-
{:title (i18n/label :t/no-dapps)
31-
:description (i18n/label :t/no-collectibles-description)
32-
:placeholder? true}]
30+
{:title (i18n/label :t/no-dapps)
31+
:description (i18n/label :t/no-collectibles-description)
32+
:image (resources/get-image
33+
(quo.theme/theme-value :no-dapps-light :no-dapps-dark theme))}]
3334
[rn/view {:style style/dapps-container}
3435
[rn/flat-list
3536
{:data dapps-list
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
(ns status-im2.contexts.wallet.account.tabs.view
22
(:require
33
[react-native.core :as rn]
4+
[status-im2.common.resources :as resources]
45
[status-im2.contexts.wallet.account.tabs.about.view :as about]
56
[status-im2.contexts.wallet.account.tabs.dapps.view :as dapps]
67
[status-im2.contexts.wallet.common.activity-tab.view :as activity]
@@ -10,8 +11,8 @@
1011
[status-im2.contexts.wallet.common.token-value.view :as token-value]
1112
[utils.i18n :as i18n]))
1213

13-
(defn view
14-
[{:keys [selected-tab]}]
14+
(defn- view-internal
15+
[{:keys [selected-tab theme]}]
1516
(case selected-tab
1617
:assets [rn/flat-list
1718
{:render-fn token-value/view
@@ -20,8 +21,11 @@
2021
:collectibles [collectibles/view]
2122
:activity [activity/view]
2223
:permissions [empty-tab/view
23-
{:title (i18n/label :t/no-permissions)
24-
:description (i18n/label :t/no-collectibles-description)
25-
:placeholder? true}]
24+
{:title (i18n/label :t/no-permissions)
25+
:description (i18n/label :t/no-collectibles-description)
26+
:image (resources/get-image
27+
(quo.theme/theme-value :no-permissions-light :no-permissions-dark theme))}]
2628
:dapps [dapps/view]
2729
[about/view]))
30+
31+
(def view (quo.theme/with-theme view-internal))

src/status_im2/contexts/wallet/account/view.cljs

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
[{:id :assets :label (i18n/label :t/assets) :accessibility-label :assets-tab}
2626
{:id :collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}
2727
{:id :activity :label (i18n/label :t/activity) :accessibility-label :activity-tab}
28-
{:id :permissions :label (i18n/label :t/permissions) :accessibility-label :permissions}
28+
;; Disabled for new wallet MVP
29+
;{:id :permissions :label (i18n/label :t/permissions) :accessibility-label :permissions}
2930
{:id :dapps :label (i18n/label :t/dapps) :accessibility-label :dapps}
3031
{:id :about :label (i18n/label :t/about) :accessibility-label :about}])
3132

src/status_im2/contexts/wallet/common/activity_tab/view.cljs

+10-6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
(:require
33
[quo.core :as quo]
44
[react-native.core :as rn]
5+
[status-im2.common.resources :as resources]
56
[status-im2.contexts.wallet.common.empty-tab.view :as empty-tab]
67
[status-im2.contexts.wallet.common.temp :as temp]
78
[utils.i18n :as i18n]))
@@ -14,15 +15,18 @@
1415
(merge {:on-press #(js/alert "Item pressed")}
1516
item)]])
1617

17-
(defn view
18-
[]
19-
(let [activity-list temp/activity-list]
18+
(defn- view-internal
19+
[{:keys [theme]}]
20+
(let [activity-list []]
2021
(if (empty? activity-list)
2122
[empty-tab/view
22-
{:title (i18n/label :t/no-activity)
23-
:description (i18n/label :t/empty-tab-description)
24-
:placeholder? true}]
23+
{:title (i18n/label :t/no-activity)
24+
:description (i18n/label :t/empty-tab-description)
25+
:image (resources/get-image
26+
(quo.theme/theme-value :no-activity-light :no-activity-dark theme))}]
2527
[rn/flat-list
2628
{:data activity-list
2729
:style {:flex 1}
2830
:render-fn activity-item}])))
31+
32+
(def view (quo.theme/with-theme view-internal))

src/status_im2/contexts/wallet/common/collectibles_tab/view.cljs

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
(:require
33
[quo.core :as quo]
44
[react-native.core :as rn]
5+
[status-im2.common.resources :as resources]
56
[status-im2.contexts.wallet.common.empty-tab.view :as empty-tab]
67
[utils.i18n :as i18n]
78
[utils.re-frame :as rf]))
89

9-
(defn view
10-
[]
10+
(defn- view-internal
11+
[{:keys [theme]}]
1112
(let [collectible-list (rf/sub [:wallet/collectibles])]
1213
(if (empty? collectible-list)
1314
[empty-tab/view
14-
{:title (i18n/label :t/no-collectibles)
15-
:description (i18n/label :t/no-collectibles-description)
16-
:placeholder? true}]
15+
{:title (i18n/label :t/no-collectibles)
16+
:description (i18n/label :t/no-collectibles-description)
17+
:image (resources/get-image
18+
(quo.theme/theme-value :no-collectibles-light :no-collectibles-dark theme))}]
1719
[rn/flat-list
1820
{:data collectible-list
1921
:style {:flex 1}
@@ -25,3 +27,5 @@
2527
:on-press #(rf/dispatch
2628
[:navigate-to
2729
:wallet-collectible])}])}])))
30+
31+
(def view (quo.theme/with-theme view-internal))

src/status_im2/contexts/wallet/home/view.cljs

+1-4
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@
5353
[common.top-nav/view]
5454
[rn/view {:style style/overview-container}
5555
[quo/wallet-overview (temp/wallet-overview-state networks)]]
56-
[rn/pressable
57-
{:on-long-press #(rf/dispatch [:show-bottom-sheet
58-
{:content temp/wallet-temporary-navigation}])}
59-
[quo/wallet-graph {:time-frame :empty}]]
56+
[quo/wallet-graph {:time-frame :empty}]
6057
[rn/flat-list
6158
{:style style/accounts-list
6259
:content-container-style style/accounts-list-container

0 commit comments

Comments
 (0)