diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 74fd9ca99..ab6496387 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -354,7 +354,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_TEAM = 32J6BB6VUS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -494,7 +494,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_TEAM = 32J6BB6VUS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -528,7 +528,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 16; DEVELOPMENT_TEAM = 32J6BB6VUS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/lib/bitcoin/bitcoin_wallet.dart b/lib/bitcoin/bitcoin_wallet.dart index 8ee012e75..e5c29e240 100644 --- a/lib/bitcoin/bitcoin_wallet.dart +++ b/lib/bitcoin/bitcoin_wallet.dart @@ -169,7 +169,7 @@ abstract class BitcoinWalletBase extends WalletBase with Store { Future init() async { if (addresses.isEmpty || addresses.length < 33) { final addressesCount = 33 - addresses.length; - await generateNewAddresses(addressesCount, startIndex: _accountIndex); + await generateNewAddresses(addressesCount, startIndex: addresses.length); } address = addresses[_accountIndex].address; diff --git a/lib/src/screens/dashboard/widgets/address_page.dart b/lib/src/screens/dashboard/widgets/address_page.dart index fca2d7e8c..060d71b09 100644 --- a/lib/src/screens/dashboard/widgets/address_page.dart +++ b/lib/src/screens/dashboard/widgets/address_page.dart @@ -45,58 +45,63 @@ class AddressPage extends StatelessWidget { amountTextFieldFocusNode: _cryptoAmountFocus, isAmountFieldShow: !addressListViewModel.hasAccounts), )), - addressListViewModel.hasAddressList - ? GestureDetector( - onTap: () => - Navigator.of(context).pushNamed(Routes.receive), - child: Container( - height: 50, - padding: EdgeInsets.only(left: 24, right: 12), - alignment: Alignment.center, - decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(25)), - border: Border.all( - color: - Theme.of(context).textTheme.subhead.color, - width: 1), - color: Theme.of(context).buttonColor), - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Observer( - builder: (_) => Text( - addressListViewModel.hasAccounts - ? S.of(context).accounts_subaddresses - : S.of(context).addresses, - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w500, - color: Theme.of(context) - .accentTextTheme - .display3 - .backgroundColor), - )), - Icon( - Icons.arrow_forward_ios, - size: 14, - color: Theme.of(context) - .accentTextTheme - .display3 - .backgroundColor, - ) - ], + Observer(builder: (_) { + return addressListViewModel.hasAddressList + ? GestureDetector( + onTap: () => + Navigator.of(context).pushNamed(Routes.receive), + child: Container( + height: 50, + padding: EdgeInsets.only(left: 24, right: 12), + alignment: Alignment.center, + decoration: BoxDecoration( + borderRadius: + BorderRadius.all(Radius.circular(25)), + border: Border.all( + color: + Theme.of(context).textTheme.subhead.color, + width: 1), + color: Theme.of(context).buttonColor), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Observer( + builder: (_) => Text( + addressListViewModel.hasAccounts + ? S + .of(context) + .accounts_subaddresses + : S.of(context).addresses, + style: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w500, + color: Theme.of(context) + .accentTextTheme + .display3 + .backgroundColor), + )), + Icon( + Icons.arrow_forward_ios, + size: 14, + color: Theme.of(context) + .accentTextTheme + .display3 + .backgroundColor, + ) + ], + ), ), - ), - ) - : PrimaryButton( - onPressed: () => addressListViewModel.nextAddress(), - text: 'Next address', - color: Theme.of(context).buttonColor, - textColor: Theme.of(context) - .accentTextTheme - .display3 - .backgroundColor) + ) + : PrimaryButton( + onPressed: () => addressListViewModel.nextAddress(), + text: 'Next address', + color: Theme.of(context).buttonColor, + textColor: Theme.of(context) + .accentTextTheme + .display3 + .backgroundColor); + }) ], ), )); diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart index 0286f7b4d..8551c9746 100644 --- a/lib/src/screens/receive/widgets/qr_widget.dart +++ b/lib/src/screens/receive/widgets/qr_widget.dart @@ -109,7 +109,7 @@ class QRWidget extends StatelessWidget { maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle( - fontSize: 16, + fontSize: 15, fontWeight: FontWeight.w500, color: Theme.of(context).accentTextTheme. display3.backgroundColor), diff --git a/lib/src/screens/send/widgets/confirm_sending_alert.dart b/lib/src/screens/send/widgets/confirm_sending_alert.dart index 458c34432..d1c916fc3 100644 --- a/lib/src/screens/send/widgets/confirm_sending_alert.dart +++ b/lib/src/screens/send/widgets/confirm_sending_alert.dart @@ -148,12 +148,12 @@ class ConfirmSendingAlert extends BaseAlertDialog { ) ), Padding( - padding: EdgeInsets.fromLTRB(8, 16, 8, 0), + padding: EdgeInsets.fromLTRB(0, 16, 0, 0), child: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - recipientTitle, + '$recipientTitle:', style: TextStyle( fontSize: 16, fontWeight: FontWeight.normal, diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart index 7d1551100..19ff62ce2 100644 --- a/lib/src/widgets/base_alert_dialog.dart +++ b/lib/src/widgets/base_alert_dialog.dart @@ -132,7 +132,7 @@ class BaseAlertDialog extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.center, children: [ Padding( - padding: EdgeInsets.fromLTRB(24, 32, 24, 0), + padding: EdgeInsets.fromLTRB(24, 20, 24, 0), child: title(context), ), isDividerExists diff --git a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart index ebfa9ad2a..9f9531864 100644 --- a/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart +++ b/lib/view_model/wallet_address_list/wallet_address_list_view_model.dart @@ -143,6 +143,7 @@ abstract class WalletAddressListViewModelBase with Store { return null; } + @computed bool get hasAddressList => _wallet.type == WalletType.monero; @observable diff --git a/pubspec.yaml b/pubspec.yaml index b2018cebe..61e6b0cc8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: Cake Wallet. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 4.1.0+30 +version: 4.1.0+32 environment: sdk: ">=2.7.0 <3.0.0"