Commit graph

977 commits

Author SHA1 Message Date
OleksandrSobol
1a9ab1a686 Merge branch 'main' into CAKE-306-add-moonpay-option-for-btc-buying
# Conflicts:
#	res/values/strings_zh.arb
2021-06-02 10:18:52 +03:00
OleksandrSobol
c8debf46ef CAKE-306 | fixed pre_order_page.dart 2021-06-02 10:03:14 +03:00
OleksandrSobol
1bf6ef6077 CAKE-306 | applied localization to MoonPay alert 2021-06-02 09:56:06 +03:00
OleksandrSobol
9e1c151f85 CAKE-306 | fixed moonpay_buy_provider.dart; added onEnabled() method to moonpay_buy_provider.dart; checked is MoonPayBuyProvider enabled; added isMoonPayEnabled to settings_store.dart 2021-06-01 21:03:35 +03:00
OleksandrSobol
bb92fb3288 CAKE-306 | merged main branch into current and resolved problems 2021-05-28 17:58:10 +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
M
78056072d4 Merge branch 'main' of github.com:cake-tech/cake_wallet 2021-05-27 10:46:21 +03:00
M
72a39fd43b Merge pull request #132 from Zy143L/translate
update strings_zh.arb
2021-05-25 20:10:07 +03:00
M
29272156be Merge pull request #138 from cake-tech/hope-with-me-patch-2
Update Terms_of_Use.txt
2021-05-25 20:09:09 +03:00
M
41dae6d1a7 Merge pull request #137 from cake-tech/hope-with-me-patch-1
Update PRIVACY.md
2021-05-25 20:08:43 +03:00
Nadiia
034db933c3 Update Terms_of_Use.txt 2021-05-25 20:05:51 +03:00
Nadiia
c419d883cd Update PRIVACY.md 2021-05-25 20:03:28 +03:00
OleksandrSobol
f324d6599d CAKE-192 | added final int UNSTOPPABLE_DOMAIN_MIN_VERSION_SDK to MainActivity.java 2021-05-25 16:53:35 +03:00
OleksandrSobol
4d6cc87529 CAKE-192 | merged main branch into current; fixed call unstoppable domains api for different sdk versions; fixed italian and croatian locales 2021-05-24 21:06:12 +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
M
485109e605 Merge branch 'main' of github.com:cake-tech/cake_wallet 2021-05-24 18:59:47 +03:00
OleksandrSobol
9ad276622f CAKE-297 | merged main branch into current 2021-05-18 19:37:43 +03:00
OleksandrSobol
b474936aee Merge branch 'main' into CAKE-297-subaddress-for-incoming-transaction
# Conflicts:
#	lib/monero/monero_wallet.dart
#	lib/view_model/transaction_details_view_model.dart
2021-05-18 19:25:49 +03:00
OleksandrSobol
66e22c2d07 CAKE-324 | fixed localization 2021-05-18 19:14:42 +03:00
OleksandrSobol
34ee2dd8e6 CAKE-324 | added website and github links to support page 2021-05-17 21:22:49 +03:00
M
5d780d5590 Update pubspec.yaml 2021-05-17 20:22:25 +03:00
Zy143L
e520bbc66a Fix...
Fix Fix...Fix
2021-05-17 02:35:35 +08:00
Zy143L
48c2790ef2 add node server
add node server
2021-05-17 02:35:21 +08:00
Zy143L
3b3d1030ec Fix 139# use 2021-05-17 01:42:28 +08:00
Zy143L
e927b7dc54 更新 strings_zh.arb
fix...
2021-05-13 15:53:01 +08:00
Zy143L
f9d0b17716 更新 strings_zh.arb
update  474-477
2021-05-13 15:40:00 +08:00
OleksandrSobol
9da3d837c3 CAKE-297 | fixed subaddrIndex in the monero_api.cpp and transaction_info_row.dart 2021-05-12 19:38:16 +03:00
OleksandrSobol
8567f20809 CAKE-297 | fixed addressIndex 2021-05-12 19:34:36 +03:00
M
643da68048 Minor bug fixes. 4.2.1. 2021-05-12 18:06:39 +03:00
M
66d5dc56f7 Merge pull request #129 from cake-tech/ltc
Type fixes. Fixed way for check monero nodes health.
2021-05-11 19:58:20 +03:00
M
053e0d18ef Type fixes. Fixed way for check monero nodes health. 2021-05-11 19:57:12 +03:00
M
48325c94a0 Merge pull request #128 from cake-tech/ltc
Ltc
2021-05-11 19:29:00 +03:00
M
f4c57e22f2 Minor bug fixes. 2021-05-11 18:37:26 +03:00
M
a439560d4d Fixes for LTC and added banner for old bitcoin electrum wallets. 2021-05-11 16:52:48 +03:00
OleksandrSobol
00d5542739 CAKE-321 | changed resizeToAvoidBottomPadding parameter to resizeToAvoidBottomInset 2021-05-10 20:58:05 +03:00
M
b096123ea1 Fixed mnemonic generation call for litecoin service. 2021-05-10 20:01:54 +03:00
M
2b4248e30b Merged main into ltc. 2021-05-10 19:51:13 +03:00
M
8e4833c06f Merge pull request #124 from cake-tech/CAKE-303-add-buy-button-for-xmr-wallet
CAKE-303 | added buy button for xmr wallet and applied buy alert
2021-05-10 19:36:43 +03:00
M
f2f5e03a54 Update dashboard_page.dart 2021-05-10 19:35:57 +03:00
M
bc0b50af5e Update dashboard_page.dart 2021-05-10 19:35:22 +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
c603943b2f Merge pull request #115 from Zy143L/translate
Fix Chinese translation
2021-05-10 19:29:22 +03:00
M
91548cd527 Merge branch 'main' into translate 2021-05-10 19:29:13 +03:00
M
a3557e30b3 Merge pull request #127 from cake-tech/CAKE-320-add-Croatian-language
CAKE-320 | added Croatian language to the app
2021-05-10 19:26:59 +03:00
M
c3859d3d47 Merge branch 'main' into CAKE-320-add-Croatian-language 2021-05-10 19:26:52 +03:00
M
6aa887df9d Merge pull request #126 from cake-tech/CAKE-317-change-app-logo
Cake 317 change app logo
2021-05-10 19:26:17 +03:00
M
b23db7e414 Merge pull request #125 from cake-tech/CAKE-314-bnb-exchange-bug
CAKE-314 | changed bnb crypto currency to bnb bep2; removed bnb bep2 …
2021-05-10 19:26:00 +03:00
M
bfa76ddea9 Merge pull request #120 from cake-tech/CAKE-315-remove-nano-currency-from-the-exchange
CAKE-315 | removed nano from list of crypto currencies in the crypto_…
2021-05-10 19:25:12 +03:00
M
6de6352d33 Merge pull request #119 from cake-tech/CAKE-316-add-Italian-language
CAKE-316 | added Italian language to the app
2021-05-10 19:24:56 +03:00
M
274c36326c Merge pull request #118 from cake-tech/CAKE-312-bypass-lock-bug
CAKE-312 | wrapped unlock page by WillPopScope; fixed biometricAuth()…
2021-05-10 19:24:27 +03:00