Skip to content

Commit 4bcc5c3

Browse files
kevtechikevtechi
authored
Merge pull request #262 from citizenwallet/release/2.0.29
Release/2.0.29
2 parents ae4bccc + 8cd2d3f commit 4bcc5c3

19 files changed

Lines changed: 2035 additions & 396 deletions

File tree

‎.cursorrules‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
flutter
2+
- cupertino widgets, no material
3+
4+
documentation
5+
- docs/ directory
6+
- includes documentation on how the app is structured
7+
8+
colors
9+
- lib/theme
10+
- defined as const that can be globally imported
11+
12+
routing
13+
- gorouter
14+
- lib/routes/router
15+
- this is where we provide state management
16+
17+
modals
18+
- lib/widgets/modals/dismissible_modal_popup.dart
19+
- showCupertinoDialog or showCupertinoModalPopup
20+
- state is provided around the modal directly
21+
- kept next to relevant screen as 'name_modal.dart'
22+
23+
services
24+
- lib/services
25+
- any package or external service that needs to be called should be defined as a service
26+
27+
state
28+
- docs/state.md
29+
- provider
30+
- lib/state
31+
- favor provider over local state management
32+
- this is where we call services, we never call services from widgets directly
33+
- state is defined under routes or modals and therefore typically scoped
34+
- use local state management only for self-contained widgets (animations, hiding widgets, etc...)
35+
36+
screens
37+
- lib/screens
38+
- folder structure follows routing structure
39+
- modals live next to their respective screen, move modals up if they are shared
40+
41+
widgets
42+
- lib/widgets
43+
- anything that doesn't use provider
44+
45+
models
46+
- lib/models
47+
- models related specifically to services should live with the service
48+
- models intended for the app, should be kept in the models folder
49+
- docs/models.md - comprehensive documentation of all app models
50+
51+
db
52+
- docs/db.md
53+
- a service lib/services/db
54+
- abstract class for db lib/services/db/db.dart
55+
- abstract class for a db table lib/services/db/db.dart
56+
- we instantiate the db and include the tables inside lib/services/db/app/db.dart
57+
- we import and use table individually

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ if (keystorePropertiesFile.exists()) {
3131

3232
android {
3333
// compileSdkVersion flutter.compileSdkVersion
34-
compileSdkVersion 35
34+
compileSdkVersion 36
3535
// ndkVersion flutter.ndkVersion
36-
ndkVersion = "27.0.12077973"
36+
ndkVersion = "28.2.13676358"
3737

3838
compileOptions {
3939
sourceCompatibility JavaVersion.VERSION_1_8

‎assets/config/v4/communities.json‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@
159159
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/wallet.pay.brussels.png",
160160
"url": "https://checkout.pay.brussels/topup",
161161
"action": "topup",
162-
"signature": true
162+
"signature": true,
163+
"featured": true
163164
}
164165
],
165166
"config_location": "https://wallet.pay.brussels/config/community.json",
@@ -305,6 +306,14 @@
305306
"url": "https://ipfs.internal.citizenwallet.xyz"
306307
},
307308
"plugins": [
309+
{
310+
"name": "Map",
311+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/sfluv.svg",
312+
"url": "https://app.sfluv.org/map",
313+
"launch_mode": "webview",
314+
"featured": true,
315+
"signature": true
316+
},
308317
{
309318
"name": "About",
310319
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/sfluv.svg",
@@ -328,6 +337,7 @@
328337
"theme": {
329338
"primary": "#eb6c6c"
330339
},
340+
"hidden": true,
331341
"profile": {
332342
"address": "0x05e2Fb34b4548990F96B3ba422eA3EF49D5dAa99",
333343
"chain_id": 137
@@ -462,6 +472,7 @@
462472
"theme": {
463473
"primary": "#009393"
464474
},
475+
"hidden": true,
465476
"profile": {
466477
"address": "0x898C2737f2Cb52622711A89D85A1D5E0B881BDeA",
467478
"chain_id": 137
@@ -515,11 +526,14 @@
515526
},
516527
{
517528
"community": {
518-
"name": "Breadchain Community Token",
519-
"description": "BREAD is a digital community token and solidarity primitive developed by Breadchain Cooperative that generates yield for post-capitalist organizations",
520-
"url": "https://breadchain.xyz/",
529+
"name": "Bread Cooperative",
530+
"description": "Financial tools today. Solidarity forever.",
531+
"url": "https://bread.coop",
521532
"alias": "bread",
522-
"logo": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
533+
"logo": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
534+
"theme": {
535+
"primary": "#ea6023"
536+
},
523537
"profile": {
524538
"address": "0x6b3a1f4277391526413F583c23D5B9EF4d2fE986",
525539
"chain_id": 100
@@ -536,7 +550,7 @@
536550
"tokens": {
537551
"100:0xa555d5344f6fb6c65da19e403cb4c1ec4a1a5ee3": {
538552
"standard": "erc20",
539-
"name": "Breadchain Community Token",
553+
"name": "Bread Cooperative Community Token",
540554
"address": "0xa555d5344f6fb6c65da19e403cb4c1ec4a1a5ee3",
541555
"symbol": "BREAD",
542556
"decimals": 18,
@@ -578,38 +592,39 @@
578592
"plugins": [
579593
{
580594
"name": "Market",
581-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
595+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
582596
"url": "https://marketplace.citizenwallet.xyz/bread",
583597
"launch_mode": "webview",
584-
"signature": true
598+
"signature": true,
599+
"featured": true
585600
},
586601
{
587602
"name": "Breadcon 2025 Faucet",
588-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
603+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
589604
"url": "https://faucet.citizenwallet.xyz/breadcon2025",
590605
"launch_mode": "webview",
591606
"signature": true,
592607
"hidden": true
593608
},
594609
{
595610
"name": "Japan Demo",
596-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
611+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
597612
"url": "https://hackatsuonvoting.vercel.app",
598613
"launch_mode": "webview",
599614
"signature": true,
600615
"hidden": true
601616
},
602617
{
603618
"name": "Japan Demo",
604-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
619+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
605620
"url": "https://grow-kesennuma.vercel.app",
606621
"launch_mode": "webview",
607622
"signature": true,
608623
"hidden": true
609624
},
610625
{
611626
"name": "Mutual Vend",
612-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
627+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
613628
"url": "https://mutual-vend.com",
614629
"launch_mode": "webview",
615630
"signature": true,
@@ -714,6 +729,7 @@
714729
"theme": {
715730
"primary": "#ff4c02"
716731
},
732+
"hidden": true,
717733
"profile": {
718734
"address": "0x13Dd4B3cD2f2Be3eb41cD0C3E2ce9F8d8C93A451",
719735
"chain_id": 8453
@@ -951,7 +967,8 @@
951967
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/myrt.png",
952968
"url": "https://marketplace.citizenwallet.xyz/seldesalm",
953969
"launch_mode": "webview",
954-
"signature": true
970+
"signature": true,
971+
"featured": true
955972
}
956973
],
957974
"config_location": "https://seldesalm.citizenwallet.xyz/config/community.json",

‎assets/config/v4/communities.test.json‎

Lines changed: 45 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@
159159
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/wallet.pay.brussels.png",
160160
"url": "https://checkout.pay.brussels/topup",
161161
"action": "topup",
162-
"signature": true
162+
"signature": true,
163+
"featured": true
163164
}
164165
],
165166
"config_location": "https://wallet.pay.brussels/config/community.json",
@@ -305,6 +306,14 @@
305306
"url": "https://ipfs.internal.citizenwallet.xyz"
306307
},
307308
"plugins": [
309+
{
310+
"name": "Map",
311+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/sfluv.svg",
312+
"url": "https://app.sfluv.org/map",
313+
"launch_mode": "webview",
314+
"featured": true,
315+
"signature": true
316+
},
308317
{
309318
"name": "About",
310319
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/sfluv.svg",
@@ -328,6 +337,7 @@
328337
"theme": {
329338
"primary": "#eb6c6c"
330339
},
340+
"hidden": true,
331341
"profile": {
332342
"address": "0x05e2Fb34b4548990F96B3ba422eA3EF49D5dAa99",
333343
"chain_id": 137
@@ -462,6 +472,7 @@
462472
"theme": {
463473
"primary": "#009393"
464474
},
475+
"hidden": true,
465476
"profile": {
466477
"address": "0x898C2737f2Cb52622711A89D85A1D5E0B881BDeA",
467478
"chain_id": 137
@@ -515,11 +526,14 @@
515526
},
516527
{
517528
"community": {
518-
"name": "Breadchain Community Token",
519-
"description": "BREAD is a digital community token and solidarity primitive developed by Breadchain Cooperative that generates yield for post-capitalist organizations",
520-
"url": "https://breadchain.xyz/",
529+
"name": "Bread Cooperative",
530+
"description": "Financial tools today. Solidarity forever.",
531+
"url": "https://bread.coop",
521532
"alias": "bread",
522-
"logo": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
533+
"logo": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
534+
"theme": {
535+
"primary": "#ea6023"
536+
},
523537
"profile": {
524538
"address": "0x6b3a1f4277391526413F583c23D5B9EF4d2fE986",
525539
"chain_id": 100
@@ -536,7 +550,7 @@
536550
"tokens": {
537551
"100:0xa555d5344f6fb6c65da19e403cb4c1ec4a1a5ee3": {
538552
"standard": "erc20",
539-
"name": "Breadchain Community Token",
553+
"name": "Bread Cooperative Community Token",
540554
"address": "0xa555d5344f6fb6c65da19e403cb4c1ec4a1a5ee3",
541555
"symbol": "BREAD",
542556
"decimals": 18,
@@ -578,42 +592,43 @@
578592
"plugins": [
579593
{
580594
"name": "Market",
581-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
595+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
582596
"url": "https://marketplace.citizenwallet.xyz/bread",
583597
"launch_mode": "webview",
584-
"signature": true
598+
"signature": true,
599+
"featured": true
585600
},
586601
{
587602
"name": "Breadcon 2025 Faucet",
588-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
603+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
589604
"url": "https://faucet.citizenwallet.xyz/breadcon2025",
590605
"launch_mode": "webview",
591606
"signature": true,
592607
"hidden": true
593608
},
594609
{
595-
"name": "Japan Demo",
596-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
597-
"url": "https://hackatsuonvoting.vercel.app",
598-
"launch_mode": "webview",
599-
"signature": true,
600-
"hidden": true
610+
"name": "Japan Demo",
611+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
612+
"url": "https://hackatsuonvoting.vercel.app",
613+
"launch_mode": "webview",
614+
"signature": true,
615+
"hidden": true
601616
},
602617
{
603-
"name": "Japan Demo",
604-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
605-
"url": "https://grow-kesennuma.vercel.app",
606-
"launch_mode": "webview",
607-
"signature": true,
608-
"hidden": true
618+
"name": "Japan Demo",
619+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
620+
"url": "https://grow-kesennuma.vercel.app",
621+
"launch_mode": "webview",
622+
"signature": true,
623+
"hidden": true
609624
},
610625
{
611-
"name": "Mutual Vend",
612-
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread.svg",
613-
"url": "https://mutual-vend.com",
614-
"launch_mode": "webview",
615-
"signature": true,
616-
"hidden": true
626+
"name": "Mutual Vend",
627+
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/bread2.png",
628+
"url": "https://mutual-vend.com",
629+
"launch_mode": "webview",
630+
"signature": true,
631+
"hidden": true
617632
}
618633
],
619634
"config_location": "https://config.internal.citizenwallet.xyz/v4/bread.citizenwallet.xyz.json",
@@ -714,6 +729,7 @@
714729
"theme": {
715730
"primary": "#ff4c02"
716731
},
732+
"hidden": true,
717733
"profile": {
718734
"address": "0x13Dd4B3cD2f2Be3eb41cD0C3E2ce9F8d8C93A451",
719735
"chain_id": 8453
@@ -951,7 +967,8 @@
951967
"icon": "https://assets.citizenwallet.xyz/wallet-config/_images/myrt.png",
952968
"url": "https://marketplace.citizenwallet.xyz/seldesalm",
953969
"launch_mode": "webview",
954-
"signature": true
970+
"signature": true,
971+
"featured": true
955972
}
956973
],
957974
"config_location": "https://seldesalm.citizenwallet.xyz/config/community.json",

0 commit comments

Comments
 (0)