From 1d996c94c88f1aa4457a376d5ed86965a77765f7 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Fri, 23 Jul 2021 14:05:33 +0300 Subject: [PATCH 1/7] CAKE-343 | added address book button to xmr wallet's address text field on exchange_page.dart and exchange_template_page.dart --- lib/src/screens/exchange/exchange_page.dart | 2 + .../exchange/exchange_template_page.dart | 2 + .../exchange/widgets/exchange_card.dart | 119 ++++++++++++++---- .../exchange/exchange_view_model.dart | 3 + 4 files changed, 99 insertions(+), 27 deletions(-) diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart index 727630f5..8811b677 100644 --- a/lib/src/screens/exchange/exchange_page.dart +++ b/lib/src/screens/exchange/exchange_page.dart @@ -188,6 +188,7 @@ class ExchangePage extends BasePage { exchangeViewModel.isDepositAddressEnabled, isAmountEstimated: false, hasRefundAddress: true, + isMoneroWallet: exchangeViewModel.isMoneroWallet, currencies: CryptoCurrency.all, onCurrencySelected: (currency) { // FIXME: need to move it into view model @@ -260,6 +261,7 @@ class ExchangePage extends BasePage { exchangeViewModel .isReceiveAddressEnabled, isAmountEstimated: true, + isMoneroWallet: exchangeViewModel.isMoneroWallet, currencies: exchangeViewModel.receiveCurrencies, onCurrencySelected: (currency) => diff --git a/lib/src/screens/exchange/exchange_template_page.dart b/lib/src/screens/exchange/exchange_template_page.dart index fb90f596..3708df87 100644 --- a/lib/src/screens/exchange/exchange_template_page.dart +++ b/lib/src/screens/exchange/exchange_template_page.dart @@ -136,6 +136,7 @@ class ExchangeTemplatePage extends BasePage { .isDepositAddressEnabled, isAmountEstimated: false, hasRefundAddress: true, + isMoneroWallet: exchangeViewModel.isMoneroWallet, currencies: CryptoCurrency.all, onCurrencySelected: (currency) => exchangeViewModel.changeDepositCurrency( @@ -175,6 +176,7 @@ class ExchangeTemplatePage extends BasePage { initialIsAddressEditable: exchangeViewModel.isReceiveAddressEnabled, isAmountEstimated: true, + isMoneroWallet: exchangeViewModel.isMoneroWallet, currencies: exchangeViewModel.receiveCurrencies, onCurrencySelected: (currency) => exchangeViewModel.changeReceiveCurrency( diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart index f534ccca..8b93f1db 100644 --- a/lib/src/screens/exchange/widgets/exchange_card.dart +++ b/lib/src/screens/exchange/widgets/exchange_card.dart @@ -1,3 +1,5 @@ +import 'package:cake_wallet/entities/contact_base.dart'; +import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/utils/show_bar.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:flutter/services.dart'; @@ -19,6 +21,7 @@ class ExchangeCard extends StatefulWidget { this.initialIsAddressEditable, this.isAmountEstimated, this.hasRefundAddress = false, + this.isMoneroWallet = false, this.currencies, this.onCurrencySelected, this.imageArrow, @@ -44,6 +47,7 @@ class ExchangeCard extends StatefulWidget { final bool initialIsAddressEditable; final bool isAmountEstimated; final bool hasRefundAddress; + final bool isMoneroWallet; final Image imageArrow; final Color currencyButtonColor; final Color addressButtonsColor; @@ -72,6 +76,7 @@ class ExchangeCardState extends State { bool _isAmountEditable; bool _isAddressEditable; bool _isAmountEstimated; + bool _isMoneroWallet; @override void initState() { @@ -81,6 +86,7 @@ class ExchangeCardState extends State { _walletName = widget.initialWalletName; _selectedCurrency = widget.initialCurrency; _isAmountEstimated = widget.isAmountEstimated; + _isMoneroWallet = widget.isMoneroWallet; addressController.text = widget.initialAddress; super.initState(); } @@ -322,34 +328,93 @@ class ExchangeCardState extends State { : Padding( padding: EdgeInsets.only(top: 10), child: Builder( - builder: (context) => GestureDetector( - onTap: () { - Clipboard.setData( - ClipboardData(text: addressController.text)); - showBar( - context, S.of(context).copied_to_clipboard); - }, - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Expanded( - child: Text( - addressController.text, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w600, - color: Colors.white), - ), - ), - Padding( - padding: EdgeInsets.only(left: 16), - child: copyImage, + builder: (context) => Stack( + children: [ + BaseTextFormField( + controller: addressController, + readOnly: true, + borderColor: Colors.transparent, + suffixIcon: SizedBox( + width: _isMoneroWallet ? 80 : 36 + ), + textStyle: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w600, + color: Colors.white), + validator: widget.addressTextFieldValidator + ), + Positioned( + top: 2, + right: 0, + child: SizedBox( + width: _isMoneroWallet ? 80 : 36, + child: Row( + children: [ + if (_isMoneroWallet) Padding( + padding: EdgeInsets.only(left: 10), + child: Container( + width: 34, + height: 34, + padding: EdgeInsets.only(top: 0), + child: InkWell( + onTap: () async { + final contact = await Navigator + .of(context, rootNavigator: true) + .pushNamed( + Routes.pickerAddressBook); + + if (contact is ContactBase && + contact.address != null) { + setState(() => + addressController.text = + contact.address); + } + }, + child: Container( + padding: EdgeInsets.all(8), + decoration: BoxDecoration( + color: widget + .addressButtonsColor, + borderRadius: BorderRadius + .all(Radius.circular(6))), + child: Image.asset( + 'assets/images/open_book.png', + color: Theme.of(context) + .primaryTextTheme + .display1 + .decorationColor, + )), + )), + ), + Padding( + padding: EdgeInsets.only(left: 2), + child: Container( + width: 34, + height: 34, + padding: EdgeInsets.only(top: 0), + child: InkWell( + onTap: () { + Clipboard.setData( + ClipboardData( + text: addressController.text)); + showBar( + context, S.of(context) + .copied_to_clipboard); + }, + child: Container( + padding: EdgeInsets + .fromLTRB(8, 8, 0, 8), + color: Colors.transparent, + child: copyImage), + )) + ) + ] ) - ], - ), - )), + ) + ) + ] + ) + ), ), ]), ); diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart index 01246542..97034358 100644 --- a/lib/view_model/exchange/exchange_view_model.dart +++ b/lib/view_model/exchange/exchange_view_model.dart @@ -9,6 +9,7 @@ import 'package:cake_wallet/exchange/exchange_provider.dart'; import 'package:cake_wallet/exchange/limits.dart'; import 'package:cake_wallet/exchange/trade.dart'; import 'package:cake_wallet/exchange/limits_state.dart'; +import 'package:cake_wallet/monero/monero_wallet.dart'; import 'package:cake_wallet/store/dashboard/trades_store.dart'; import 'package:cake_wallet/store/settings_store.dart'; import 'package:intl/intl.dart'; @@ -125,6 +126,8 @@ abstract class ExchangeViewModelBase with Store { bool get hasAllAmount => wallet.type == WalletType.bitcoin && depositCurrency == wallet.currency; + bool get isMoneroWallet => wallet is MoneroWallet; + List receiveCurrencies; Limits limits; From a20969b650bba4349c6d8c8b795999cb93f01cc1 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Fri, 23 Jul 2021 16:57:49 +0300 Subject: [PATCH 2/7] CAKE-334 | reworked unspent_coins_list_item.dart --- .../unspent_coins_list_page.dart | 3 +- .../widgets/unspent_coins_list_item.dart | 59 ++++++++++++++----- res/values/strings_de.arb | 1 + res/values/strings_en.arb | 1 + res/values/strings_es.arb | 1 + res/values/strings_hi.arb | 1 + res/values/strings_hr.arb | 1 + res/values/strings_it.arb | 1 + res/values/strings_ja.arb | 1 + res/values/strings_ko.arb | 1 + res/values/strings_nl.arb | 1 + res/values/strings_pl.arb | 1 + res/values/strings_pt.arb | 1 + res/values/strings_ru.arb | 1 + res/values/strings_uk.arb | 1 + res/values/strings_zh.arb | 1 + 16 files changed, 61 insertions(+), 15 deletions(-) diff --git a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart index 074979eb..d8c3b89a 100644 --- a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart +++ b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart @@ -86,9 +86,10 @@ class UnspentCoinsListFormState extends State { .pushNamed(Routes.unspentCoinsDetails, arguments: [item, unspentCoinsListViewModel]), child: UnspentCoinsListItem( - address: item.address, + note: item.note, amount: item.amount, isSending: item.isSending, + isFrozen: item.isFrozen, onCheckBoxTap: item.isFrozen ? null : () async { diff --git a/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart b/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart index 44886dce..93282e59 100644 --- a/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart +++ b/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart @@ -2,12 +2,14 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:cake_wallet/palette.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; +import 'package:cake_wallet/generated/i18n.dart'; class UnspentCoinsListItem extends StatelessWidget { UnspentCoinsListItem({ - @required this.address, + @required this.note, @required this.amount, @required this.isSending, + @required this.isFrozen, @required this.onCheckBoxTap, }); @@ -16,9 +18,10 @@ class UnspentCoinsListItem extends StatelessWidget { static const selectedItemColor = Palette.paleCornflowerBlue; static const unselectedItemColor = Palette.moderateLavender; - final String address; + final String note; final String amount; final bool isSending; + final bool isFrozen; final Function() onCheckBoxTap; @override @@ -51,7 +54,7 @@ class UnspentCoinsListItem extends StatelessWidget { width: 1.0), borderRadius: BorderRadius.all( Radius.circular(8.0)), - color: Theme.of(context).backgroundColor), + color: itemColor), child: isSending ? Icon( Icons.check, @@ -64,25 +67,53 @@ class UnspentCoinsListItem extends StatelessWidget { ), Expanded( child: Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: (note?.isNotEmpty ?? false) + ? MainAxisAlignment.spaceBetween + : MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, children: [ - AutoSizeText( - amount, - style: TextStyle( - color: amountColor, - fontSize: 16, - fontWeight: FontWeight.w600 - ), - maxLines: 1, + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded( + child: AutoSizeText( + amount, + style: TextStyle( + color: amountColor, + fontSize: 16, + fontWeight: FontWeight.w600 + ), + maxLines: 1, + ), + ), + if (isFrozen) Container( + height: 17, + padding: EdgeInsets.only(left: 6, right: 6), + decoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(8.5)), + color: Colors.white), + alignment: Alignment.center, + child: Text( + S.of(context).frozen, + style: TextStyle( + color: amountColor, + fontSize: 7, + fontWeight: FontWeight.w600 + ), + ) + ) + ], ), - AutoSizeText( - address, + if (note?.isNotEmpty ?? false) Text( + note, style: TextStyle( color: addressColor, fontSize: 12, ), maxLines: 1, + overflow: TextOverflow.ellipsis ) ] ) diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 8ad27e3b..85fe0604 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Nicht ausgegebene Münzen", "unspent_coins_details_title" : "Details zu nicht ausgegebenen Münzen", "freeze" : "Einfrieren", + "frozen" : "Gefroren", "coin_control" : "Münzkontrolle (optional)", "address_detected" : "Adresse erkannt", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 22ac371f..524479f4 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Unspent coins", "unspent_coins_details_title" : "Unspent coins details", "freeze" : "Freeze", + "frozen" : "Frozen", "coin_control" : "Coin control (optional)", "address_detected" : "Address detected", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index d372db5a..36d6ff15 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Monedas no gastadas", "unspent_coins_details_title" : "Detalles de monedas no gastadas", "freeze" : "Congelar", + "frozen" : "Congelada", "coin_control" : "Control de monedas (opcional)", "address_detected" : "Dirección detectada", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index c290dc73..03f88b62 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "खर्च न किए गए सिक्के", "unspent_coins_details_title" : "अव्ययित सिक्कों का विवरण", "freeze" : "फ्रीज", + "frozen" : "जमा हुआ", "coin_control" : "सिक्का नियंत्रण (वैकल्पिक)", "address_detected" : "पता लग गया", diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index dec79f2c..e40fcc97 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Nepotrošeni novčići", "unspent_coins_details_title" : "Nepotrošeni detalji o novčićima", "freeze" : "Zamrznuti", + "frozen" : "Smrznuto", "coin_control" : "Kontrola novca (nije obavezno)", "address_detected" : "Adresa je otkrivena", diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index 92f3be68..559b1c80 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Monete non spese", "unspent_coins_details_title" : "Dettagli sulle monete non spese", "freeze" : "Congelare", + "frozen" : "Congelato", "coin_control" : "Controllo monete (opzionale)", "address_detected" : "Indirizzo rilevato", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index d82f5de2..c661c4a9 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "未使用のコイン", "unspent_coins_details_title" : "未使用のコインの詳細", "freeze" : "氷結", + "frozen" : "凍った", "coin_control" : "コインコントロール（オプション）", "address_detected" : "アドレスが検出されました", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 0ff685c1..bbd8803a 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "사용하지 않은 동전", "unspent_coins_details_title" : "사용하지 않은 동전 세부 정보", "freeze" : "얼다", + "frozen" : "겨울 왕국", "coin_control" : "코인 제어 (옵션)", "address_detected" : "주소 감지", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 2fd48e8b..dddae8a5 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Ongebruikte munten", "unspent_coins_details_title" : "Details van niet-uitgegeven munten", "freeze" : "Bevriezen", + "frozen" : "Bevroren", "coin_control" : "Muntcontrole (optioneel)", "address_detected" : "Adres gedetecteerd", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 9f8cf235..318d29c6 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Niewydane monety", "unspent_coins_details_title" : "Szczegóły niewydanych monet", "freeze" : "Zamrażać", + "frozen" : "Mrożony", "coin_control" : "Kontrola monet (opcjonalnie)", "address_detected" : "Wykryto adres", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 59693aa8..2eed0439 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Moedas não gastas", "unspent_coins_details_title" : "Detalhes de moedas não gastas", "freeze" : "Congelar", + "frozen" : "Congeladas", "coin_control" : "Controle de moedas (opcional)", "address_detected" : "Endereço detectado", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 5fd09752..f2e31df6 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Неизрасходованные монеты", "unspent_coins_details_title" : "Сведения о неизрасходованных монетах", "freeze" : "Заморозить", + "frozen" : "Заморожено", "coin_control" : "Контроль монет (необязательно)", "address_detected" : "Обнаружен адрес", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 2bbbfd8e..82d10fc0 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "Невитрачені монети", "unspent_coins_details_title" : "Відомості про невитрачені монети", "freeze" : "Заморозити", + "frozen" : "Заморожено", "coin_control" : "Контроль монет (необов’язково)", "address_detected" : "Виявлено адресу", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 1e4ebc39..f79dc3fe 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -488,6 +488,7 @@ "unspent_coins_title" : "未使用的硬幣", "unspent_coins_details_title" : "未使用代幣詳情", "freeze" : "凍結", + "frozen" : "凍結的", "coin_control" : "硬幣控制（可選）", "address_detected" : "檢測到地址", From b3028f0ba2af260bca594de6afadbd1c8bf93776 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Fri, 23 Jul 2021 18:38:56 +0300 Subject: [PATCH 3/7] CAKE-334 | fixed unspent_coins_list_item.dart --- .../unspent_coins/unspent_coins_list_page.dart | 1 + .../widgets/unspent_coins_list_item.dart | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart index d8c3b89a..931e618a 100644 --- a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart +++ b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart @@ -88,6 +88,7 @@ class UnspentCoinsListFormState extends State { child: UnspentCoinsListItem( note: item.note, amount: item.amount, + address: item.address, isSending: item.isSending, isFrozen: item.isFrozen, onCheckBoxTap: item.isFrozen diff --git a/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart b/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart index 93282e59..e4814e9e 100644 --- a/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart +++ b/lib/src/screens/unspent_coins/widgets/unspent_coins_list_item.dart @@ -8,6 +8,7 @@ class UnspentCoinsListItem extends StatelessWidget { UnspentCoinsListItem({ @required this.note, @required this.amount, + @required this.address, @required this.isSending, @required this.isFrozen, @required this.onCheckBoxTap, @@ -20,6 +21,7 @@ class UnspentCoinsListItem extends StatelessWidget { final String note; final String amount; + final String address; final bool isSending; final bool isFrozen; final Function() onCheckBoxTap; @@ -27,6 +29,7 @@ class UnspentCoinsListItem extends StatelessWidget { @override Widget build(BuildContext context) { final itemColor = isSending? selectedItemColor : unselectedItemColor; + final _note = (note?.isNotEmpty ?? false) ? note : address; return Container( height: 62, @@ -67,9 +70,7 @@ class UnspentCoinsListItem extends StatelessWidget { ), Expanded( child: Column( - mainAxisAlignment: (note?.isNotEmpty ?? false) - ? MainAxisAlignment.spaceBetween - : MainAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( @@ -106,8 +107,8 @@ class UnspentCoinsListItem extends StatelessWidget { ) ], ), - if (note?.isNotEmpty ?? false) Text( - note, + Text( + _note, style: TextStyle( color: addressColor, fontSize: 12, From b0724348a1e556d1d2eebc04e3ebb8524eec2fd9 Mon Sep 17 00:00:00 2001 From: M Date: Fri, 23 Jul 2021 19:10:22 +0300 Subject: [PATCH 4/7] Added verification for unspent coins while transaction creation. --- lib/bitcoin/electrum_wallet.dart | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/bitcoin/electrum_wallet.dart b/lib/bitcoin/electrum_wallet.dart index 78e3f696..f86b04aa 100644 --- a/lib/bitcoin/electrum_wallet.dart +++ b/lib/bitcoin/electrum_wallet.dart @@ -158,6 +158,9 @@ abstract class ElectrumWalletBase extends WalletBase[]; + final credentialsAmount = transactionCredentials.amount != null + ? stringDoubleToBitcoinAmount(transactionCredentials.amount) + : 0; var allInputsAmount = 0; if (unspentCoins.isEmpty) { @@ -171,7 +174,8 @@ abstract class ElectrumWalletBase extends WalletBase 0 && allInputsAmount < credentialsAmount)) { throw BitcoinTransactionNoInputsException(); } @@ -179,9 +183,6 @@ abstract class ElectrumWalletBase extends WalletBase Date: Mon, 26 Jul 2021 14:05:52 +0300 Subject: [PATCH 5/7] Changed text for no inputs exception. --- .gitignore | 6 +++++- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- lib/bitcoin/bitcoin_transaction_no_inputs_exception.dart | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b5c6f1e1..398fd61b 100644 --- a/.gitignore +++ b/.gitignore @@ -100,4 +100,8 @@ ios/Flutter/.last_build_id /**/#**# **/google-services.json -**/GoogleService-Info.plist \ No newline at end of file +**/GoogleService-Info.plist + + +\#*\# +.\#* \ No newline at end of file diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8fba2745..4990b6f4 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -366,7 +366,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 53; DEVELOPMENT_TEAM = 32J6BB6VUS; ENABLE_BITCODE = NO; EXCLUDED_SOURCE_FILE_NAMES = ""; @@ -510,7 +510,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 53; DEVELOPMENT_TEAM = 32J6BB6VUS; ENABLE_BITCODE = NO; EXCLUDED_SOURCE_FILE_NAMES = ""; @@ -546,7 +546,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 51; + CURRENT_PROJECT_VERSION = 53; DEVELOPMENT_TEAM = 32J6BB6VUS; ENABLE_BITCODE = NO; EXCLUDED_SOURCE_FILE_NAMES = ""; diff --git a/lib/bitcoin/bitcoin_transaction_no_inputs_exception.dart b/lib/bitcoin/bitcoin_transaction_no_inputs_exception.dart index 2e925fdb..d4397dea 100644 --- a/lib/bitcoin/bitcoin_transaction_no_inputs_exception.dart +++ b/lib/bitcoin/bitcoin_transaction_no_inputs_exception.dart @@ -1,4 +1,4 @@ class BitcoinTransactionNoInputsException implements Exception { @override - String toString() => 'No inputs for the transaction.'; -} \ No newline at end of file + String toString() => 'Not enough inputs available'; +} From 5caf88fab2e54786cffc3b0aa0ddf2c75bd48774 Mon Sep 17 00:00:00 2001 From: M Date: Tue, 27 Jul 2021 17:33:53 +0300 Subject: [PATCH 6/7] Changed build version. --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index a7ccb572..ad531f3e 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.2.3+53 +version: 4.2.3+56 environment: sdk: ">=2.7.0 <3.0.0" From 9f27d85e32a03b74f089c4ef8d3d86abb0916972 Mon Sep 17 00:00:00 2001 From: M Date: Tue, 27 Jul 2021 18:40:40 +0300 Subject: [PATCH 7/7] Changed build version. --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index ad531f3e..47dacff2 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.2.3+56 +version: 4.2.4+57 environment: sdk: ">=2.7.0 <3.0.0"