Add current route to router. Add yat contacts to support screen.
M committed
Nov 5, 2021 at 15:08 UTC
cf20123edee0850cda05965a4a14ade98597e55a
6 files changed
+25
-5
.gitignore
+5
-1
@@ -104,4 +104,8 @@ ios/Flutter/.last_build_id
104
105
106
\#*\#
107
-.\#*
\ No newline at end of file
107
+.\#*
108
+
109
+ios/build
110
+*.sublime-workspace
111
+*.sublime-project
assets/images/yat_mini_logo.png
Binary files /dev/null and b/assets/images/yat_mini_logo.png differ
lib/router.dart
+4
@@ -68,7 +68,11 @@ import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart'
68
import 'package:flutter/services.dart';
69
import 'package:hive/hive.dart';
70
71
+RouteSettings currentRouteSettings;
72
+
73
Route<dynamic> createRoute(RouteSettings settings) {
74
+ currentRouteSettings = settings;
75
+
76
switch (settings.name) {
77
case Routes.welcome:
78
return MaterialPageRoute<void>(builder: (_) => createWelcomePage());
lib/src/screens/dashboard/dashboard_page.dart
+8
-2
@@ -23,6 +23,7 @@ import 'package:mobx/mobx.dart';
23
import 'package:smooth_page_indicator/smooth_page_indicator.dart';
24
import 'package:flutter_spinkit/flutter_spinkit.dart';
25
import 'package:cake_wallet/main.dart';
26
+import 'package:cake_wallet/router.dart';
27
28
class DashboardPage extends BasePage {
29
DashboardPage({
@@ -159,11 +160,16 @@ class DashboardPage extends BasePage {
160
walletViewModel: walletViewModel));
161
pages.add(BalancePage(dashboardViewModel: walletViewModel));
162
pages.add(TransactionsPage(dashboardViewModel: walletViewModel));
162
-
163
_isEffectsInstalled = true;
164
-
164
+
165
if (walletViewModel.shouldShowYatPopup) {
166
await Future<void>.delayed(Duration(seconds: 1));
167
+
168
+ if (currentRouteSettings.name == Routes.preSeed
169
+ || currentRouteSettings.name == Routes.seed) {
170
+ return;
171
+ }
172
+
173
await showPopUp<void>(
174
context: context,
175
builder: (BuildContext context) {
lib/src/screens/settings/widgets/settings_link_provider_cell.dart
+1
-1
@@ -19,7 +19,7 @@ class SettingsLinkProviderCell extends StandardListRow {
19
20
@override
21
Widget buildLeading(BuildContext context) =>
22
- icon != null ? Image.asset(icon, color: iconColor) : null;
22
+ icon != null ? Image.asset(icon, color: iconColor, height: 30, width: 30) : null;
23
24
@override
25
Widget buildTrailing(BuildContext context) => Text(linkTitle,
lib/view_model/support_view_model.dart
+7
-1
@@ -59,7 +59,13 @@ abstract class SupportViewModelBase with Store {
59
icon: 'assets/images/moonpay.png',
60
hasIconColor: true,
61
linkTitle: S.current.submit_request,
62
- link: 'https://support.moonpay.com/hc/en-gb/requests/new')
62
+ link: 'https://support.moonpay.com/hc/en-gb/requests/new'),
63
+ LinkListItem(
64
+ title: 'Yat',
65
+ icon: 'assets/images/yat_mini_logo.png',
66
+ hasIconColor: true,
67
+ linkTitle: 'support@y.at',
68
+ link: 'mailto:support@y.at')
69
];
70
}
71
static const url = 'https://cakewallet.com/guide/';