Skip to content

Commit 9d7e963

Browse files
authored
Merge pull request #39 from JDI-Group/redesign
Redesign
2 parents 7ea07d3 + 3b9c9c1 commit 9d7e963

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+397
-254
lines changed

assets/.env

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"v":"5.7.11","fr":60,"ip":0,"op":80,"w":60,"h":60,"nm":"loading","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Null 2","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.802],"y":[0]},"t":30,"s":[0]},{"t":80,"s":[180]}],"ix":10},"p":{"a":0,"k":[40,30,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":80,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Shape Layer 6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.693],"y":[0]},"t":0,"s":[180]},{"t":40,"s":[360]}],"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[20,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[10,10],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":80,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.802],"y":[0]},"t":30,"s":[0]},{"t":80,"s":[179]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":30,"s":[39.75,30,0],"to":[0.083,0,0],"ti":[-0.083,0,0]},{"t":80,"s":[40.25,30,0]}],"ix":2,"l":2},"a":{"a":0,"k":[9.75,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[10,10],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":80,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":3,"nm":"Adjustment Layer 1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":13,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":30,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":40,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":50,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":66,"s":[100]},{"t":80,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[30,30,0],"ix":2,"l":2},"a":{"a":0,"k":[150,150,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"残影","np":7,"mn":"ADBE Echo","ix":1,"en":1,"ef":[{"ty":0,"nm":"残影时间(秒)","mn":"ADBE Echo-0001","ix":1,"v":{"a":0,"k":-0.001,"ix":1}},{"ty":0,"nm":"残影数量","mn":"ADBE Echo-0002","ix":2,"v":{"a":0,"k":148,"ix":2}},{"ty":0,"nm":"起始强度","mn":"ADBE Echo-0003","ix":3,"v":{"a":0,"k":0.06,"ix":3}},{"ty":0,"nm":"衰减","mn":"ADBE Echo-0004","ix":4,"v":{"a":0,"k":1,"ix":4}},{"ty":7,"nm":"残影运算符","mn":"ADBE Echo-0005","ix":5,"v":{"a":0,"k":3,"ix":5}}]}],"ip":0,"op":80,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Shape Layer 8","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.693],"y":[0]},"t":0,"s":[0]},{"t":40,"s":[180]}],"ix":10},"p":{"a":0,"k":[-10,0,0],"ix":2,"l":2},"a":{"a":0,"k":[20,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[10,10],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":80,"st":0,"bm":0}],"markers":[]}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"v":"5.7.11","fr":60,"ip":0,"op":180,"w":400,"h":400,"nm":"Export","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Vector","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.5,"y":1},"o":{"x":0.167,"y":0.167},"t":105,"s":[200,200,0],"to":[-1.121,1.121,0],"ti":[2.741,-2.74,0]},{"i":{"x":0.5,"y":1},"o":{"x":0.167,"y":0.12},"t":132,"s":[153,247,0],"to":[-4.05,4.049,0],"ti":[1.657,-1.657,0]},{"i":{"x":0.5,"y":1},"o":{"x":0.074,"y":1},"t":220,"s":[239.329,160.667,0],"to":[0,0,0],"ti":[1.657,-1.657,0]},{"i":{"x":0.5,"y":1},"o":{"x":0.167,"y":0.139},"t":235,"s":[239.329,160.667,0],"to":[0,0,0],"ti":[9.333,-9.333,0]},{"t":270,"s":[183.329,216.667,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.5,0.5,0.5],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"t":0,"s":[0,0,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":30,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":51,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":65,"s":[100,30,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":80,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":306,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":320,"s":[100,30,100]},{"t":335,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-23.012,0],[0,23.012],[23.012,0],[0,-23.012]],"o":[[23.012,0],[0,-23.012],[-23.012,0],[0,23.012]],"v":[[0,41.667],[41.667,0],[0,-41.667],[-41.667,0]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.823529422283,0.945098042488,0.349019616842,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":30,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Vector","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":377,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Vector","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[199.996,200.002,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-87.445],[-87.445,0],[0,87.445]],"o":[[-87.445,0],[0,87.445],[87.445,0],[0,0]],"v":[[0,-158.333],[-158.333,0],[0,158.333],[158.333,0]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.823529422283,0.945098042488,0.349019616842,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":30,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Vector","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":139,"s":[50]},{"t":187,"s":[0]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":139,"s":[50]},{"t":187,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":396,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Star 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":232,"s":[0]},{"t":260,"s":[90]}],"ix":10},"p":{"a":0,"k":[291.66,108.335,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":232,"s":[0,0,100]},{"t":260,"s":[100,100,100]}],"ix":6,"l":2,"x":"var $bm_rt;\nvar amp, freq, decay, n, t, v;\ntry {\n amp = $bm_div(effect('缩放 - Overshoot')('ADBE Slider Control-0001'), 4), freq = $bm_div(effect('缩放 - Bounce')('ADBE Slider Control-0001'), 30), decay = $bm_div(effect('缩放 - Friction')('ADBE Slider Control-0001'), 20), n = 0, 0 < numKeys && (n = nearestKey(time).index, key(n).time > time && n--), t = 0 === n ? 0 : $bm_sub(time, key(n).time), $bm_rt = 0 < n ? (v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10))), $bm_sum(value, $bm_div($bm_mul($bm_mul($bm_div(v, 100), amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))))) : value;\n} catch (e$$4) {\n $bm_rt = value = value;\n}"}},"ao":0,"ef":[{"ty":5,"nm":"缩放 - Overshoot","np":3,"mn":"ADBE Slider Control","ix":1,"en":1,"ef":[{"ty":0,"nm":"滑块","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":0,"k":20,"ix":1,"x":"var $bm_rt;\n$bm_rt = clamp(value, 0, 100);"}}]},{"ty":5,"nm":"缩放 - Bounce","np":3,"mn":"ADBE Slider Control","ix":2,"en":1,"ef":[{"ty":0,"nm":"滑块","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":0,"k":40,"ix":1,"x":"var $bm_rt;\n$bm_rt = clamp(value, 0, 100);"}}]},{"ty":5,"nm":"缩放 - Friction","np":3,"mn":"ADBE Slider Control","ix":3,"en":1,"ef":[{"ty":0,"nm":"滑块","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":0,"k":40,"ix":1,"x":"var $bm_rt;\n$bm_rt = clamp(value, 0, 100);"}}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[6.519,31.895],[0.126,-0.615],[31.895,-6.519],[-0.615,-0.126],[-6.519,-31.895],[-0.126,0.615],[-31.895,6.519],[0.615,0.126]],"o":[[-0.126,-0.615],[-6.519,31.895],[-0.615,0.126],[31.895,6.519],[0.126,0.615],[6.519,-31.895],[0.615,-0.126],[-31.895,-6.519]],"v":[[0.565,-63.904],[-0.565,-63.904],[-63.904,-0.565],[-63.904,0.565],[-0.565,63.904],[0.565,63.904],[63.904,0.565],[63.904,-0.565]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.823529422283,0.945098042488,0.349019616842,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":30,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.823529422283,0.945098042488,0.349019616842,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"Star 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":394,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"AI motion","refId":"comp_0","sr":0.5,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[200,200,0],"ix":2,"l":2},"a":{"a":0,"k":[200,200,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":400,"h":400,"ip":0,"op":180,"st":0,"bm":0}],"markers":[]}

lib/app/app.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ class MXCWallet extends HookConsumerWidget {
6161
return route(
6262
const PasscodeRequireWrapperPage(
6363
child: HomePage(
64-
homePageSubPage: HomePageSubPage.dapps,
6564
),
6665
),
6766
);

lib/common/assets.gen.dart

Lines changed: 18 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/common/components/balance_panel/widgets/manage_portfolio_section.dart

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import 'package:moonchain_wallet/core/core.dart';
2-
import 'package:moonchain_wallet/features/portfolio/presentation/portfolio_page.dart';
31
import 'package:flutter/material.dart';
42
import 'package:flutter_i18n/flutter_i18n.dart';
53
import 'package:hooks_riverpod/hooks_riverpod.dart';
4+
import 'package:moonchain_wallet/features/wallet/wallet.dart';
65
import 'package:mxc_ui/mxc_ui.dart';
76

87
class ManagePortfolioSection extends HookConsumerWidget {
@@ -12,14 +11,10 @@ class ManagePortfolioSection extends HookConsumerWidget {
1211

1312
@override
1413
Widget build(BuildContext context, WidgetRef ref) {
14+
final presenter = ref.read(walletContainer.actions);
15+
1516
return InkWell(
16-
onTap: () {
17-
Navigator.of(context).push(
18-
route(
19-
const PortfolioPage(),
20-
),
21-
);
22-
},
17+
onTap: presenter.moveToPortfolio,
2318
child: Row(
2419
children: [
2520
Icon(

lib/core/src/app_links/app_links_router.dart

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import 'package:flutter/material.dart';
22
import 'package:moonchain_wallet/core/core.dart';
33
import 'package:moonchain_wallet/features/dapps/dapps.dart';
4+
import 'package:moonchain_wallet/features/dapps/domain/home_page_index_use_case.dart';
45
import 'package:moonchain_wallet/features/home/presentation/home_page.dart';
56
import 'package:moonchain_wallet/features/portfolio/presentation/portfolio_page.dart';
7+
import 'package:moonchain_wallet/features/wallet/wallet.dart';
68

79
class AppLinksRouter {
810
AppLinksRouter(this.navigator);
@@ -40,21 +42,22 @@ class AppLinksRouter {
4042
route(page),
4143
(route) => false,
4244
);
45+
void popUntil(String page) => navigator?.popUntil(
46+
(route) {
47+
return route.settings.name?.contains(page) ?? false;
48+
},
49+
);
4350

4451
// Combine page with It's params
4552
Widget getPageWithParams(String page, Map<String, List<String>>? params) {
4653
late Widget toPushPage;
4754

4855
switch ('/$page') {
4956
case '/':
50-
toPushPage = const HomePage(
51-
homePageSubPage: HomePageSubPage.dapps,
52-
);
57+
toPushPage = const HomePage();
5358
break;
5459
case '/dapps':
55-
toPushPage = const HomePage(
56-
homePageSubPage: HomePageSubPage.dapps,
57-
);
60+
toPushPage = const DAppsPage();
5861
break;
5962
case '/openDapp':
6063
final url = params!['url']![0];
@@ -63,25 +66,22 @@ class AppLinksRouter {
6366
);
6467
break;
6568
case '/wallet':
66-
toPushPage = const HomePage(
67-
homePageSubPage: HomePageSubPage.wallet,
68-
);
69+
toPushPage = const WalletPage();
6970
break;
7071
case '/portfolio':
7172
toPushPage = const PortfolioPage();
7273
break;
7374
default:
74-
toPushPage = const HomePage(
75-
homePageSubPage: HomePageSubPage.dapps,
76-
);
75+
toPushPage = const HomePage();
7776
}
7877

7978
return toPushPage;
8079
}
8180

8281
/// This function will do the navigation according to the page widget that
8382
/// includes the params based on how page specific navigation instruction.
84-
void navigateTo(Widget toPushPage) {
83+
void navigateTo(
84+
Widget toPushPage, HomePageIndexUseCase homePageIndexUseCase) {
8585
late Function() navigationFunc;
8686

8787
if (toPushPage.runtimeType == OpenDAppPage) {
@@ -91,11 +91,22 @@ class AppLinksRouter {
9191
} else if (toPushPage.runtimeType == PortfolioPage) {
9292
navigationFunc = () {
9393
pushAndReplaceUntil(
94-
const HomePage(
95-
homePageSubPage: HomePageSubPage.wallet,
96-
),
94+
const HomePage(),
9795
);
98-
pushTo(toPushPage);
96+
};
97+
} else if (toPushPage is HomePage) {
98+
navigationFunc = () {};
99+
} else if (toPushPage is WalletPage) {
100+
navigationFunc = () {
101+
popUntil('PasscodeRequireWrapperPage');
102+
homePageIndexUseCase
103+
.changeBottomNavigationSubPage(HomePageSubPage.wallet);
104+
};
105+
} else if (toPushPage is DAppsPage) {
106+
navigationFunc = () {
107+
popUntil('PasscodeRequireWrapperPage');
108+
homePageIndexUseCase
109+
.changeBottomNavigationSubPage(HomePageSubPage.dapps);
99110
};
100111
} else {
101112
navigationFunc = () {

lib/core/src/providers/providers_use_cases.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:moonchain_wallet/features/ai_chat/domain/reporter_use_case.dart'
66
import 'package:moonchain_wallet/features/common/account/log_out_use_case.dart';
77
import 'package:moonchain_wallet/features/common/common.dart';
88
import 'package:moonchain_wallet/features/dapps/domain/domain.dart';
9+
import 'package:moonchain_wallet/features/dapps/domain/home_page_index_use_case.dart';
910
import 'package:moonchain_wallet/features/errors/network_unavailable/network_unavailable_use_case.dart';
1011
import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/domain/nfts_use_case.dart';
1112
import 'package:moonchain_wallet/features/portfolio/subfeatures/token/add_token/domain/domain.dart';
@@ -44,6 +45,10 @@ final Provider<GesturesInstructionUseCase> gesturesInstructionUseCaseProvider =
4445
ref.watch(globalCacheProvider).gesturesInstruction),
4546
);
4647

48+
final Provider<HomePageIndexUseCase> homePageIndexUseCaseProvider = Provider(
49+
(ref) => HomePageIndexUseCase(),
50+
);
51+
4752
final Provider<DappsOrderUseCase> dappsOrderUseCaseProvider = Provider(
4853
(ref) =>
4954
DappsOrderUseCase(ref.watch(datadashCacheProvider).dappsOrderRepository),
@@ -272,6 +277,7 @@ final Provider<MoonchainAppLinksUseCase> appLinksUseCaseProvider = Provider(
272277
(ref) => MoonchainAppLinksUseCase(
273278
ref.watch(authUseCaseProvider),
274279
ref.watch(passcodeUseCaseProvider),
280+
ref.watch(homePageIndexUseCaseProvider),
275281
),
276282
);
277283

0 commit comments

Comments
 (0)