Commit graph

104 commits

Author SHA1 Message Date
OleksandrSobol
2a047e1f51 Merge branch 'release-4.2.4' into CAKE-345-batch-sending
# Conflicts:
#	lib/bitcoin/electrum_wallet.dart
#	lib/src/screens/send/send_page.dart
#	lib/src/screens/send/send_template_page.dart
#	lib/view_model/send/send_view_model.dart
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_hi.arb
#	res/values/strings_hr.arb
#	res/values/strings_it.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_uk.arb
#	res/values/strings_zh.arb
2021-07-22 17:52:48 +03:00
M
3dd1bdabcc Merge branch 'release-4.2.4' into CAKE-334-unspent-coins-control-application-logic 2021-07-22 10:48:22 +03:00
OleksandrSobol
7b2d89f96f CAKE-345 | changed bitcoin transaction credentials; reworked createTransaction() method in the electrum_wallet.dart for batch sending; fixed exchange_trade_page.dart and send_page.dart; reworked confirm_sending_alert.dart; fixed _credenials() and commitTransaction() methods in the send_view_model.dart 2021-07-20 18:03:49 +03:00
OleksandrSobol
20e0c830cf CAKE-334 | applied unspent coins control to the app; added unspent_coins_info.dart; reworked createTransaction(), calculateEstimatedFee() and updateUnspent() methods in the electrum_wallet.dart; fixed unspent_coins_list_view_model.dart, unspent_coins_details_view_model.dart, unspent_coins_list_item.dart, unspent_coins_list_page.dart and unspent_coins_details_page.dart; fixed bitcoin_transaction_wrong_balance_exception.dart; added properties to bitcoin_unspent.dart; applied localization to unspent coins pages 2021-07-05 16:52:24 +03:00
OleksandrSobol
37f326e21f Merge branch 'main' into CAKE-192-implement-unstoppable-domain
# Conflicts:
#	android/app/build.gradle
#	android/build.gradle
#	ios/Podfile
#	ios/Podfile.lock
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_hi.arb
#	res/values/strings_hr.arb
#	res/values/strings_it.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_uk.arb
#	res/values/strings_zh.arb
2021-06-15 13:18:52 +03:00
M
48066ce916 Changed alert for non supported crypto currencies for fiat buying. 2021-06-09 00:39:11 +03:00
M
98c8449b82 Merge branch 'main' into CAKE-306-add-moonpay-option-for-btc-buying 2021-06-07 21:52:58 +03:00
M
30e1fa81c7 Changed warning text for receive screen. 2021-06-07 21:44:58 +03:00
OleksandrSobol
68f1e39620 Merge branch 'main' into CAKE-306-add-moonpay-option-for-btc-buying
# Conflicts:
#	lib/di.dart
#	lib/view_model/dashboard/dashboard_view_model.dart
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_hi.arb
#	res/values/strings_hr.arb
#	res/values/strings_it.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_uk.arb
#	res/values/strings_zh.arb
2021-06-07 15:26:21 +03:00
M
b2ece79334 Added warning on receive screen for outdated electrum wallets. 2021-06-04 13:30:59 +03:00
OleksandrSobol
1bf6ef6077 CAKE-306 | applied localization to MoonPay alert 2021-06-02 09:56:06 +03:00
OleksandrSobol
1fccb0b546 Merge branch 'main' into CAKE-306-add-moonpay-option-for-btc-buying
# Conflicts:
#	lib/buy/wyre/wyre_buy_provider.dart
#	lib/di.dart
#	lib/src/screens/dashboard/dashboard_page.dart
#	lib/view_model/dashboard/dashboard_view_model.dart
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_hi.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_uk.arb
#	res/values/strings_zh.arb
2021-05-28 12:06:50 +03:00
OleksandrSobol
251d6ad502 Merge branch 'main' into CAKE-192-implement-unstoppable-domain
# Conflicts:
#	android/app/src/main/java/com/cakewallet/cake_wallet/MainActivity.java
#	ios/Runner/AppDelegate.swift
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_hi.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_uk.arb
#	res/values/strings_zh.arb
2021-05-24 19:09:43 +03:00
OleksandrSobol
66e22c2d07 CAKE-324 | fixed localization 2021-05-18 19:14:42 +03:00
M
053e0d18ef Type fixes. Fixed way for check monero nodes health. 2021-05-11 19:57:12 +03:00
M
a439560d4d Fixes for LTC and added banner for old bitcoin electrum wallets. 2021-05-11 16:52:48 +03:00
M
d9d9e3d4c1 Merge branch 'main' into CAKE-303-add-buy-button-for-xmr-wallet 2021-05-10 19:33:46 +03:00
M
bcd4fdd5e0 Changed random seed generation for bitcoin. 2021-05-10 13:06:57 +03:00
OleksandrSobol
b7cb5147e1 CAKE-303 | added buy button for xmr wallet and applied buy alert 2021-04-26 21:06:21 +03:00
OleksandrSobol
ae9efb0ae8 CAKE-192 | implemented unstoppable domain address to the app 2021-04-20 20:49:53 +03:00
OleksandrSobol
19ffffa6cc CAKE-306 | applied buy_webview_page.dart to the app; fixed order_details_view_model.dart and order_row.dart; applied localization to the pre_order_page.dart; deleted unused files 2021-04-13 21:40:44 +03:00
OleksandrSobol
013ba5f462 CAKE-301 | added wyre contact to support page 2021-03-26 20:59:38 +02:00
OleksandrSobol
3bfeaeb46b Merge branch 'main' into CAKE-272-implement-localization-generation-script
# Conflicts:
#	lib/generated/i18n.dart
#	res/values/strings_de.arb
2021-03-19 20:35:22 +02:00
OleksandrSobol
a44cb07137 CAKE-272 | implemented localization generation script to the app (generate_localization.dart) 2021-03-19 20:19:14 +02:00
OleksandrSobol
ead43439d1 CAKE-293 | changed information on exchange confirm alert 2021-03-15 20:52:15 +02:00
M
f0c7605b1d Merge branch 'main' into CAKE-278-implement-fixed-rate-flow-for-changenow 2021-03-01 19:34:15 +02:00
OleksandrSobol
bc407b9f0f CAKE-280 | updated alert text for xlm and xrp trades 2021-02-24 19:45:30 +02:00
OleksandrSobol
a4c6d01c18 CAKE-278 | applied localization to checkbox text and fixed rate alert text (exchange_page.dart) 2021-02-24 10:16:03 +02:00
OleksandrSobol
a5240236d4 CAKE-243 | added localization to backup_page.dart, edit_backup_password_page.dart, wallet_menu.dart, restore_from_backup_page.dart 2021-01-20 21:27:03 +02:00
M
553c41e3c4 Merge pull request #168 from cake-tech/CAKE-230-change-exchange-screen-alert
CAKE-230 | changed text on exchange screen alert
2021-01-15 20:14:05 +02:00
OleksandrSobol
944c218fd0 CAKE-64 | renamed 'Extra ID' on 'Destination tag' for XRP and 'Memo' for 'XLM'; applied localization to 'Destination tag' and 'Memo' 2021-01-13 11:47:56 +02:00
OleksandrSobol
580c0d87f0 CAKE-64 | added extra ID to _updateItems() method in the exchange_trade_view_model.dart; added extra_id to string resources 2021-01-11 19:14:53 +02:00
OleksandrSobol
608598f47a CAKE-230 | changed text on exchange screen alert 2021-01-08 17:31:44 +02:00
OleksandrSobol
5f287709a0 CAKE-229 | changed welcome screen text 2021-01-06 17:15:34 +02:00
M
c0835d46ef Merge branch '4.1.0' into CAKE-198-notes-for-transactions 2021-01-05 21:57:05 +02:00
Oleksandr Sobol
18ba208e44 CAKE-221 | fixed string resources 2020-12-30 18:19:16 +02:00
Oleksandr Sobol
44536a8231 CAKE-198 | fixed string resources (send_success) 2020-12-24 10:33:11 +02:00
Oleksandr Sobol
d7cc595179 CAKE-198 | changed hint text from "Note" to "Enter your note..."; changed color of the hint text in textfield_list_row 2020-12-23 19:14:11 +02:00
Oleksandr Sobol
cf5f212f33 CAKE-198 | fixed string resources 2020-12-23 15:04:57 +02:00
Oleksandr Sobol
139f223de8 CAKE-198 | fixed string resources 2020-12-23 10:39:59 +02:00
M
98343bd480 Merge pull request #160 from cake-tech/CAKE-218-change-sync-status-text
Cake 218 change sync status text
2020-12-18 21:28:59 +02:00
Oleksandr Sobol
b2a2c16feb CAKE-218 | changed sync status text 2020-12-18 17:51:57 +02:00
Oleksandr Sobol
8b349435df CAKE-207 | fixed string resources 2020-12-10 20:35:11 +02:00
Oleksandr Sobol
27cfad5d95 CAKE-185 | fixed string resources 2020-12-03 16:00:11 +02:00
Oleksandr Sobol
30baad314a Merge branch '4.0.9' into CAKE-185-digits-limit-on-monero-transaction
# Conflicts:
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_hi.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_uk.arb
#	res/values/strings_zh.arb
2020-12-03 15:55:19 +02:00
Oleksandr Sobol
c21fd04345 CAKE-185 | fixed string resources 2020-12-03 15:47:13 +02:00
Oleksandr Sobol
27cbb43c73 Merge remote-tracking branch 'origin/4.0.9' into CAKE-185-digits-limit-on-monero-transaction
# Conflicts:
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_hi.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_uk.arb
#	res/values/strings_zh.arb
2020-12-03 15:04:59 +02:00
Oleksandr Sobol
2322a4a73a CAKE-169 | fixed string resources 2020-12-02 20:47:53 +02:00
Oleksandr Sobol
aad33eb513 Merge remote-tracking branch 'origin/4.0.9' into CAKE-169-improve-new-node-screen-form
# Conflicts:
#	lib/generated/i18n.dart
#	res/values/strings_de.arb
#	res/values/strings_en.arb
#	res/values/strings_es.arb
#	res/values/strings_hi.arb
#	res/values/strings_ja.arb
#	res/values/strings_ko.arb
#	res/values/strings_nl.arb
#	res/values/strings_pl.arb
#	res/values/strings_pt.arb
#	res/values/strings_ru.arb
#	res/values/strings_uk.arb
#	res/values/strings_zh.arb
2020-12-02 20:42:41 +02:00
Oleksandr Sobol
ee666db21b CAKE-169 | fixed string resources 2020-11-30 21:37:20 +02:00