mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-11-16 09:34:06 +01:00
Merge branch 'main' into CW-159-Filter-address-book-by-type
This commit is contained in:
@@ -7,6 +7,7 @@ import 'package:cake_wallet/ionia/ionia_anypay.dart';
|
||||
import 'package:cake_wallet/ionia/ionia_merchant.dart';
|
||||
import 'package:cake_wallet/ionia/ionia_tip.dart';
|
||||
import 'package:cake_wallet/ionia/ionia_any_pay_payment_info.dart';
|
||||
import 'package:cake_wallet/view_model/send/send_view_model.dart';
|
||||
|
||||
part 'ionia_purchase_merch_view_model.g.dart';
|
||||
|
||||
@@ -17,6 +18,7 @@ abstract class IoniaMerchPurchaseViewModelBase with Store {
|
||||
required this.ioniaAnyPayService,
|
||||
required this.amount,
|
||||
required this.ioniaMerchant,
|
||||
required this.sendViewModel,
|
||||
}) : tipAmount = 0.0,
|
||||
percentage = 0.0,
|
||||
invoiceCreationState = InitialExecutionState(),
|
||||
@@ -40,6 +42,8 @@ abstract class IoniaMerchPurchaseViewModelBase with Store {
|
||||
|
||||
final IoniaMerchant ioniaMerchant;
|
||||
|
||||
final SendViewModel sendViewModel;
|
||||
|
||||
final IoniaAnyPay ioniaAnyPayService;
|
||||
|
||||
IoniaAnyPayPaymentInfo? paymentInfo;
|
||||
|
||||
@@ -156,13 +156,13 @@ abstract class SettingsViewModelBase with Store {
|
||||
handler: (BuildContext context) {
|
||||
Navigator.of(context).pushNamed(Routes.auth, arguments:
|
||||
(bool isAuthenticatedSuccessfully, AuthPageState auth) {
|
||||
auth.close();
|
||||
if (isAuthenticatedSuccessfully) {
|
||||
Navigator.of(context).pushNamed(Routes.setupPin, arguments:
|
||||
(PinCodeState<PinCodeWidget> setupPinContext, String _) {
|
||||
auth.close(
|
||||
route: isAuthenticatedSuccessfully ? Routes.setupPin : null,
|
||||
arguments: (PinCodeState<PinCodeWidget> setupPinContext,
|
||||
String _) {
|
||||
setupPinContext.close();
|
||||
});
|
||||
}
|
||||
},
|
||||
);
|
||||
});
|
||||
}),
|
||||
PickerListItem(
|
||||
|
||||
Reference in New Issue
Block a user