Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2025-01-23 11:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts with staging

Browse source
This commit is contained in:
Likho 2022-09-01 16:29:00 -05:00
commit b076e76881
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
lib/models/exchange/exchange_form_state.dart → lib/models/exchange/estimated_rate_exchange_form_state.dart
View file

14
lib/pages/send_view/send_view.dart
View file

@ -1,3 +1,5 @@
import 'dart:async';
import 'package:decimal/decimal.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -1175,7 +1177,7 @@ class _SendViewState extends ConsumerState<SendView> {
try {
bool wasCancelled = false;
showDialog<dynamic>(
unawaited(showDialog<dynamic>(
context: context,
useSafeArea: false,
barrierDismissible: false,
@ -1188,7 +1190,7 @@ class _SendViewState extends ConsumerState<SendView> {
},
);
},
);
));
final txData = await manager.prepareSend(
address: _address!,
@ -1205,7 +1207,7 @@ class _SendViewState extends ConsumerState<SendView> {
txData["note"] = noteController.text;
txData["address"] = _address;
Navigator.of(context).push(
unawaited(Navigator.of(context).push(
RouteGenerator.getRoute(
shouldUseMaterialRoute: RouteGenerator
.useMaterialPageRoute,
@ -1219,14 +1221,14 @@ class _SendViewState extends ConsumerState<SendView> {
.routeName,
),
),
);
));
}
} catch (e) {
if (mounted) {
// pop building dialog
Navigator.of(context).pop();
showDialog<dynamic>(
unawaited(showDialog<dynamic>(
context: context,
useSafeArea: false,
barrierDismissible: true,
@ -1258,7 +1260,7 @@ class _SendViewState extends ConsumerState<SendView> {
),
);
},
);
));
}
}
}

2
lib/providers/exchange/estimate_rate_exchange_form_provider.dart
View file

@ -1,5 +1,5 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/models/exchange/exchange_form_state.dart';
import 'package:stackwallet/models/exchange/estimated_rate_exchange_form_state.dart';
final estimatedRateExchangeFormProvider =
ChangeNotifierProvider((ref) => EstimatedRateExchangeFormState());

1
lib/services/coins/epiccash/epiccash_wallet.dart
View file

@ -754,7 +754,6 @@ class EpicCashWallet extends CoinServiceAPI {
String receiverAddress = txData['addresss'] as String;
await m.protect(() async {
if (receiverAddress.startsWith("http://") || receiverAddress.startsWith("https://")) {
const int selectionStrategyIsAll = 0;
ReceivePort receivePort = await getIsolate({