Add throwing exception for yat api calls. Remove random address generation on address page.
M committed
Jan 12, 2022 at 17:38 UTC
6f215f5451a7d613f04044fa20f510c624459305
4 files changed
+59
-52
lib/src/screens/dashboard/widgets/address_page.dart
-1
@@ -27,7 +27,6 @@ class AddressPage extends StatelessWidget {
27
28
@override
29
Widget build(BuildContext context) {
30
- addressListViewModel.generateRandomAddress();
30
autorun((_) async {
31
if (!walletViewModel.isOutdatedElectrumWallet
32
|| !walletViewModel.settingsStore.shouldShowReceiveWarning) {
lib/src/screens/yat/yat_sending.dart
+21
-21
@@ -66,28 +66,28 @@ class YatSending extends BasePage {
66
color: Colors.black,
67
child: Stack(
68
children: [
69
- Center(
70
- child:FutureBuilder<String>(
71
- future: visualisationForEmojiId(sendViewModel.outputs.first.address),
72
- builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
73
- switch (snapshot.connectionState) {
74
- case ConnectionState.done:
75
- if (snapshot.hasError || snapshot.data.isEmpty) {
76
- return Image.asset('assets/images/yat_logo.png', width: screenWidth, color: Colors.white);
77
- }
69
+ //Center(
70
+ // child:FutureBuilder<String>(
71
+ // future: visualisationForEmojiId(sendViewModel.outputs.first.address),
72
+ // builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
73
+ // switch (snapshot.connectionState) {
74
+ // case ConnectionState.done:
75
+ // if (snapshot.hasError || snapshot.data.isEmpty) {
76
+ // return Image.asset('assets/images/yat_logo.png', width: screenWidth, color: Colors.white);
77
+ // }
78
79
- return Image.network(
80
- snapshot.data,
81
- scale: 0.7,
82
- loadingBuilder: (Object z, Widget child, ImageChunkEvent loading)
83
- => loading != null
84
- ? CupertinoActivityIndicator(animating: true)
85
- : child);
86
- default:
87
- return Image.asset('assets/images/yat_logo.png', width: screenWidth, color: Colors.white);
88
- }
89
- }),
90
- ),
79
+ // return Image.network(
80
+ // snapshot.data,
81
+ // scale: 0.7,
82
+ // loadingBuilder: (Object z, Widget child, ImageChunkEvent loading)
83
+ // => loading != null
84
+ // ? CupertinoActivityIndicator(animating: true)
85
+ // : child);
86
+ // default:
87
+ // return Image.asset('assets/images/yat_logo.png', width: screenWidth, color: Colors.white);
88
+ // }
89
+ // }),
90
+ // ),
91
Positioned(
92
bottom: 20,
93
child: Container(
lib/store/yat/yat_store.dart
+20
-12
@@ -43,6 +43,7 @@ class YatLink {
43
}
44
45
Future<List<String>> fetchYatAddress(String emojiId, String ticker) async {
46
+ throw Exception();
47
//final url = YatLink.emojiIdUrl + emojiId + '/payment';
48
//final response = await get(url);
49
@@ -71,6 +72,7 @@ Future<List<String>> fetchYatAddress(String emojiId, String ticker) async {
72
}
73
74
Future<String> fetchYatAccessToken(String refreshToken) async {
75
+ throw Exception();
76
//try {
77
// final url = YatLink.apiUrl + '/auth/token/refresh';
78
// final bodyJson = json.encode({'refresh_token': refreshToken});
@@ -95,6 +97,7 @@ Future<String> fetchYatAccessToken(String refreshToken) async {
97
}
98
99
Future<String> fetchYatApiKey(String accessKey) async {
100
+ throw Exception();
101
//try {
102
// final url = YatLink.apiUrl + '/api_keys';
103
// final bodyJson = json.encode({'name': 'CW'});
@@ -120,6 +123,7 @@ Future<String> fetchYatApiKey(String accessKey) async {
123
}
124
125
Future<void> updateEmojiIdAddress(String emojiId, String address, String apiKey, WalletType type) async {
126
+ throw Exception();
127
//final url = YatLink.emojiIdUrl + emojiId;
128
//final cur = walletTypeToCryptoCurrency(type);
129
//final curFormatted = cur.toString().toUpperCase();
@@ -152,6 +156,7 @@ Future<void> updateEmojiIdAddress(String emojiId, String address, String apiKey,
156
}
157
158
Future<String> visualisationForEmojiId(String emojiId) async {
159
+ throw Exception();
160
//final url = YatLink.emojiIdUrl + emojiId + '/json/VisualizerFileLocations';
161
//final response = await get(url);
162
//final responseJSON = json.decode(response.body) as Map<String, dynamic>;
@@ -167,9 +172,9 @@ abstract class YatStoreBase with Store {
172
YatStoreBase({@required this.appStore, @required this.secureStorage}) {
173
_wallet ??= appStore.wallet;
174
emoji = _wallet?.walletInfo?.yatEmojiId ?? '';
170
- reaction((_) => appStore.wallet, _onWalletChange);
171
- reaction((_) => emoji, (String _) => _onEmojiChange());
172
- reaction((_) => refreshToken, (String _) => _onRefreshTokenChange());
175
+ //reaction((_) => appStore.wallet, _onWalletChange);
176
+ //reaction((_) => emoji, (String _) => _onEmojiChange());
177
+ //reaction((_) => refreshToken, (String _) => _onRefreshTokenChange());
178
emojiIncommingSC = StreamController<String>.broadcast();
179
}
180
@@ -246,18 +251,21 @@ abstract class YatStoreBase with Store {
251
252
@action
253
Future<void> _onRefreshTokenChange() async {
249
- try {
250
- await secureStorage.write(key: yatRefreshTokenKey(_wallet.walletInfo.name), value: refreshToken);
251
- accessToken = await fetchYatAccessToken(refreshToken);
252
- await secureStorage.write(key: yatAccessTokenKey(_wallet.walletInfo.name), value: accessToken);
253
- apiKey = await fetchYatApiKey(accessToken);
254
- await secureStorage.write(key: yatApiKey(_wallet.walletInfo.name), value: accessToken);
255
- } catch (e) {
256
- print(e.toString());
257
- }
254
+ throw Exception();
255
+
256
+ //try {
257
+ // await secureStorage.write(key: yatRefreshTokenKey(_wallet.walletInfo.name), value: refreshToken);
258
+ // accessToken = await fetchYatAccessToken(refreshToken);
259
+ // await secureStorage.write(key: yatAccessTokenKey(_wallet.walletInfo.name), value: accessToken);
260
+ // apiKey = await fetchYatApiKey(accessToken);
261
+ // await secureStorage.write(key: yatApiKey(_wallet.walletInfo.name), value: accessToken);
262
+ //} catch (e) {
263
+ // print(e.toString());
264
+ //}
265
}
266
267
String defineQueryParameters() {
268
+ throw Exception();
269
//final result = <String, String>{};
270
//final tags = YatLink.tags[_wallet.currency.toString().toUpperCase()];
271
//String tag = tags.first;
lib/view_model/settings/settings_view_model.dart
+18
-18
@@ -69,29 +69,29 @@ abstract class SettingsViewModelBase with Store {
69
_settingsStore.priority[wallet.type] = priorities.first;
70
}
71
72
- var connectYatUrl = YatLink.baseUrl + YatLink.signInSuffix;
73
- final connectYatUrlParameters =
74
- _yatStore.defineQueryParameters();
72
+ //var connectYatUrl = YatLink.baseUrl + YatLink.signInSuffix;
73
+ //final connectYatUrlParameters =
74
+ // _yatStore.defineQueryParameters();
75
76
- if (connectYatUrlParameters.isNotEmpty) {
77
- connectYatUrl += YatLink.queryParameter + connectYatUrlParameters;
78
- }
76
+ //if (connectYatUrlParameters.isNotEmpty) {
77
+ // connectYatUrl += YatLink.queryParameter + connectYatUrlParameters;
78
+ //}
79
80
- var manageYatUrl = YatLink.baseUrl + YatLink.managePath;
81
- final manageYatUrlParameters =
82
- _yatStore.defineQueryParameters();
80
+ //var manageYatUrl = YatLink.baseUrl + YatLink.managePath;
81
+ //final manageYatUrlParameters =
82
+ // _yatStore.defineQueryParameters();
83
84
- if (manageYatUrlParameters.isNotEmpty) {
85
- manageYatUrl += YatLink.queryParameter + manageYatUrlParameters;
86
- }
84
+ //if (manageYatUrlParameters.isNotEmpty) {
85
+ // manageYatUrl += YatLink.queryParameter + manageYatUrlParameters;
86
+ //}
87
88
- var createNewYatUrl = YatLink.startFlowUrl;
89
- final createNewYatUrlParameters =
90
- _yatStore.defineQueryParameters();
88
+ //var createNewYatUrl = YatLink.startFlowUrl;
89
+ //final createNewYatUrlParameters =
90
+ // _yatStore.defineQueryParameters();
91
92
- if (createNewYatUrlParameters.isNotEmpty) {
93
- createNewYatUrl += '?sub1=' + createNewYatUrlParameters;
94
- }
92
+ //if (createNewYatUrlParameters.isNotEmpty) {
93
+ // createNewYatUrl += '?sub1=' + createNewYatUrlParameters;
94
+ //}
95
96
97
sections = [