v4.13.0 and v1.10.0 (#1265)

* New versions

* Minor fix [skip ci]

* Minor UI enhancement for balance card

* Minor UI enhancement

* Add Monero build configs for MacOS [skip ci]

* Add rest of Macos Configs [skip ci]

* Delete empty file
Save and report restore from backup exceptions [skip ci]

* Minor fixes
This commit is contained in:
Omar Hatem
2024-01-16 02:02:10 +02:00
committed by GitHub
parent fe2e26f146
commit d8f1cdc7ef
33 changed files with 155 additions and 56 deletions
+1 -2
View File
@@ -74,8 +74,6 @@ class ProvidersHelper {
static List<ProviderType> getAvailableSellProviderTypes(WalletType walletType) {
switch (walletType) {
case WalletType.monero:
return [ProviderType.askEachTime, ProviderType.dfx];
case WalletType.bitcoin:
case WalletType.ethereum:
return [ProviderType.askEachTime, ProviderType.onramper,
@@ -83,6 +81,7 @@ class ProvidersHelper {
case WalletType.litecoin:
case WalletType.bitcoinCash:
return [ProviderType.askEachTime, ProviderType.moonpaySell];
case WalletType.monero:
case WalletType.nano:
case WalletType.banano:
case WalletType.none:
@@ -123,8 +123,8 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
alertContent: S.of(context).change_wallet_alert_content(selectedWallet.name),
leftButtonText: S.of(context).cancel,
rightButtonText: S.of(context).change,
actionLeftButton: () => Navigator.of(context).pop(false),
actionRightButton: () => Navigator.of(context).pop(true));
actionLeftButton: () => Navigator.of(dialogContext).pop(false),
actionRightButton: () => Navigator.of(dialogContext).pop(true));
}) ??
false;
@@ -265,7 +265,7 @@ class BalanceRowWidget extends StatelessWidget {
color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
),
child: Container(
margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24),
margin: const EdgeInsets.only(top: 16, left: 24, right: 8, bottom: 16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@@ -329,7 +329,7 @@ class BalanceRowWidget extends StatelessWidget {
),
),
SizedBox(
width: MediaQuery.of(context).size.width * 0.18,
width: min(MediaQuery.of(context).size.width * 0.2, 100),
child: Center(
child: Column(
children: [
@@ -337,8 +337,8 @@ class BalanceRowWidget extends StatelessWidget {
? Container(
child: Image.asset(
currency.iconPath!,
height: 30.0,
width: 30.0,
height: 40.0,
width: 40.0,
),
)
: Container(
@@ -359,7 +359,7 @@ class BalanceRowWidget extends StatelessWidget {
Text(
currency.title,
style: TextStyle(
fontSize: 18,
fontSize: 15,
fontFamily: 'Lato',
fontWeight: FontWeight.w800,
color: Theme.of(context).extension<BalancePageTheme>()!.assetTitleColor,
@@ -1,5 +1,7 @@
import 'dart:io';
import 'package:cake_wallet/core/execution_state.dart';
import 'package:cake_wallet/utils/exception_handler.dart';
import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';
import 'package:cake_wallet/main.dart';
@@ -60,11 +62,17 @@ abstract class RestoreFromBackupViewModelBase with Store {
});
state = ExecutedSuccessfullyState();
} catch (e) {
} catch (e, s) {
var msg = e.toString();
if (msg.toLowerCase().contains("message authentication code (mac)")) {
msg = 'Incorrect backup password';
} else {
ExceptionHandler.onError(FlutterErrorDetails(
exception: e,
stack: s,
library: this.toString(),
));
}
state = FailureState(msg);