Commit graph

59 commits

Author SHA1 Message Date
Omar Hatem
d1832aa510
Merge branch 'main' into CW-225-pin-timeout 2022-12-13 20:40:20 +02:00
OmarHatem
01024b6694 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-66-open-app-from-qr-code
 Conflicts:
	lib/di.dart
	lib/src/screens/send/send_page.dart
	lib/src/screens/send/widgets/send_card.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_fr.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
2022-12-12 15:41:16 +02:00
Godwin Asuquo
07ea937d37 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout 2022-12-09 19:42:07 +01:00
Omar Hatem
357ebe5fc8
Merge pull request #595 from cake-tech/CW-118-Allow-disabling-of-fiat
CW-118 Allow disabling of fiat
2022-12-09 20:20:16 +02:00
Justin Ehrenhofer
1fc4f809e5
Merge branch 'main' into warning-wording 2022-12-09 08:44:30 -06:00
OmarHatem
fddac23b94 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-118-Allow-disabling-of-fiat
 Conflicts:
	res/values/strings_de.arb
	res/values/strings_en.arb
	res/values/strings_es.arb
	res/values/strings_fr.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
2022-12-08 14:01:20 +02:00
OmarHatem
55b37164dc - Make getters to ease attribute access
- Add the old 'disable_fiat' translation
- rename getters to be more bool like names
2022-12-07 22:07:32 +02:00
Serhii
228e157b39 [skip ci] Update localization 2022-12-07 14:04:14 +02:00
Serhii
214c1fe0db Merge branch 'main' into CW-118-Allow-disabling-of-fiat 2022-12-06 17:37:12 +02:00
Godwin Asuquo
65cbdd3fbb Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout 2022-12-05 13:33:17 +01:00
OmarHatem
9d64789983 Fix Conflict with main
Rename classes to advanced privacy settings to avoid confusion between settings/privacy-settings
2022-12-04 05:08:42 +02:00
OmarHatem
f792b58338 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-180-advanced-startup-privacy-settings
 Conflicts:
	lib/di.dart
	lib/routes.dart
	lib/view_model/node_list/node_create_or_edit_view_model.dart
	res/values/strings_de.arb
	res/values/strings_en.arb
	res/values/strings_es.arb
	res/values/strings_fr.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
2022-12-04 04:34:32 +02:00
Omar Hatem
dc60123f79
Merge pull request #529 from cake-tech/CW-182-allow-trusted-nodes
Cw 182 allow trusted nodes
2022-12-04 02:17:35 +02:00
Omar Hatem
bfcd3ee002
Merge pull request #643 from cake-tech/CW-223-settings-reorganization
Cw 223 settings reorganization
2022-12-01 21:37:43 +02:00
Godwin Asuquo
28abb4ded0 Add localization strings 2022-11-30 15:28:27 +02:00
OmarHatem
0d685823ce Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-66-open-app-from-qr-code
 Conflicts:
	res/values/strings_de.arb
	res/values/strings_en.arb
	res/values/strings_es.arb
	res/values/strings_fr.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
2022-11-29 17:45:31 +02:00
Serhii
1a420a7470 Merge branch 'main' into CW-221-Change-synchronization-status-text 2022-11-28 22:24:25 +02:00
Godwin Asuquo
7da2de60cb Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout 2022-11-28 18:27:21 +02:00
Godwin Asuquo
63df8c6b6f Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-223-settings-reorganization 2022-11-23 22:54:24 +02:00
Godwin Asuquo
818a8afe20 [CW-225] Add pin timeout setting 2022-11-22 22:52:28 +02:00
Serhii
50d32021f6 Merge branch 'main' into CW-118-Allow-disabling-of-fiat 2022-11-22 19:48:43 +02:00
Omar Hatem
9b32c9c956
CW-227 Add Disable Exchange option to settings (#642)
* Add Disable Exchange option to settings
2022-11-21 21:18:18 -05:00
Godwin Asuquo
549975ecc1 Reorganize settings 2022-11-16 09:29:14 +02:00
Justin Ehrenhofer
cf7c21946b Improve warning wording
Recommended in the Telegram testing group
2022-11-10 14:45:10 -06:00
OmarHatem
6210d8fba6 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-180-advanced-startup-privacy-settings
 Conflicts:
	cw_core/lib/node.dart
	lib/di.dart
	lib/router.dart
	lib/routes.dart
	lib/view_model/node_list/node_create_or_edit_view_model.dart
	res/values/strings_de.arb
	res/values/strings_en.arb
	res/values/strings_es.arb
	res/values/strings_fr.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
2022-11-09 15:40:12 +02:00
Serhii
7d92a964c7 Change synchronization status text
changed the status from "Starting sync" to "Attempting sync".
2022-11-09 12:14:21 +02:00
OmarHatem
7c7de65cdf Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-66-open-app-from-qr-code
 Conflicts:
	lib/di.dart
	lib/src/screens/send/send_page.dart
	lib/src/screens/send/widgets/send_card.dart
	lib/utils/payment_request.dart
	res/values/strings_de.arb
	res/values/strings_en.arb
	res/values/strings_es.arb
	res/values/strings_fr.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
2022-11-08 14:44:58 +02:00
Serhii
b5e74874ce update localization files 2022-11-04 14:11:06 +02:00
OmarHatem
b8eaf98ff1 Merge branch 'flutter-upgrade' of https://github.com/cake-tech/cake_wallet into CW-182-allow-trusted-nodes 2022-11-03 21:34:20 +02:00
Serhii
a52f47220e
show warning if exchanging with slow fee (#579)
* show warning if exchanging with slow fee

* Update setDefaultTransactionPriority for return type void; update for use MoneroTransactionPriority.automatic instead of MoneroTransactionPriority.regular.

Co-authored-by: M <m@cakewallet.com>
2022-11-03 15:21:35 -04:00
Serhii
b27b55388c
add warning text to the seed screen (#587)
* Add warning text to the seed screen

* fix font size
2022-11-02 15:53:14 -04:00
Serhii
0040bca853
Add partners contacts (#577)
Contacts of SideShift and SimpleSwap partners added to the Support section
2022-11-02 14:11:05 -04:00
Omar Hatem
c34c3b0737
Cw 199 add wallet deletion confirmation (#555)
* Fix Slidable for deleting wallet
Add confirmation dialog for deleting wallet

* Swap confirmation dialog buttons to be consistent with other alerts
2022-10-21 16:06:59 -04:00
OmarHatem
6bbedde9b7 Add privacy settings route
Add text translation
2022-10-05 15:58:25 +02:00
OmarHatem
d748f12e44 Allow marking Monero Nodes as trusted 2022-10-04 14:54:39 +02:00
Mathias Herberts
4f0b7bf51a
Minor fixes for French locale post v4.4.6 (#508)
* Fixed typo and added missing settings_display_balance entry.

* Fixed typographical errors and typo
2022-09-16 13:22:51 -04:00
Mathias Herberts
7aa5013b5d
Fixed French translations (#384)
* Fixed French translations

* Update strings_fr.arb

Add Haven to first_wallet_text for FR

Co-authored-by: mkyq <53115730+mkyq@users.noreply.github.com>
2022-09-07 14:13:54 +01:00
mkyq
4ae69d0344
Update text for cake pay learn more notification (#502) 2022-09-07 13:46:13 +01:00
Paul Verbeke
da46b8bfb4
i18n: fix french translations (#483)
QR code
search languages and currencies
wallet name errors
2022-09-02 15:11:13 +01:00
Godwin Asuquo
bd25d047b2
CW-148 cake pay partial redemptions (#490)
* Ionia custom redemption screen

* update ionia gift card remaining amount with custom value

* [NO-TASK] Fix issues with custom redeem

* replace redeem

* update remaining amount

* fixed from code review

* Add localization
2022-09-02 14:47:45 +01:00
Serhii
0aee6e1b8d
rework trade details screen (#449)
* create standart list card item

* create standart list status item

* update localization

* fix date format

* fix theme gradient

* PR comments

* fix issues from code review
2022-09-02 14:10:54 +01:00
Omar Hatem
c50eeee58b
CW 68 exchange automatic rate selector (#472)
* Add 'Exchange provider picker'
Save user selections

* Save user's exchange providers selection

* Add text for selected providers availability

* Fix selected providers not updating

* Load limits based on highest maximum in the selected providers

* Change received and deposit amount to be the best value from the selected providers

* Add provider name next to Trade ID
Set selected provider based on amount calculated

* Grey out providers who doesn't support selected currency pair

* Fix disabled providers

* Add Provider logo in Confirm Screen

* Only choose a provider if it satisfies its limits

* Fix amount validation

* Fix typo in error message

* Add a queue of possible exchange providers sorted by the best rate to try next if one failed

* Fix string locale typo

* Add Localization for other languages

* Add Placeholder text when there are no providers selected

* Check Exchange provider availability before creating a trade

* Fix "Fixed Rate" changing unconditionally

* Enable "convert to" field regardless of the provider

* Remove "Choose one" from providers picker

* Merge Master

* Fix Conflicts with master

* Add missing isEnabled field in simple swap provider
2022-09-01 15:12:38 +01:00
Serhii
7fae9cf9bb
Cw 150 cake pay introduction card (#486)
* create introducing card

* add ability to close the card

* update walletInfo class

* update localization

* fix intro text

* fix card size

* show card for existing and new wallet types

* disable card for haven wallets

* fixes to PR

* fixes to PR

* fix PR
2022-08-30 19:03:02 +01:00
Serhii
8a740e1c41
change account sign-in/sign-up text (#462) 2022-08-11 15:44:27 +01:00
OmarHatem28
e5fac16ef7 Notify user when a different currency is scanned 2022-08-09 17:06:21 +02:00
mkyq
418c9563fe
Ionia (#437)
* Initial ionia service

* Ionia manage card UI (#374)

* design ui for cakepay

* Add manage cards page ui

* create auth ui for ionia

* add authentication logic

* implement user create card

* Add ionia merchant sevic

* Add anypay. Add purschase gift card.

* display virtual card (#385)

* display virtual card

* fix formatting

* Remove IoniaMerchantService from IoniaViewModel

* Add hex and txKey for monero pending transaction.

* Changed monero version and monero repo to cake tech.

* Add anypay payment. Add filter by search for ionia, add get purchased items for ionia.

* Fix for get transactions for hidden addresses for electrum wallet

* Add ionia categories.

* Add anypay commited info for payments.

* Update UI with new fixes (#400)

* Change ionia base url. Add exception throwing for error messaging for some of ionia calls.

* CW-102 fix logic for ionia issues (#403)

* refactor tips (#406)

* refactor tips

* refactor ionia tips implementation

* Cw 115 implement gift cards list for ionia (#405)

* Implement show purchased cards

* fix padding

* Fixes for getting of purchased gift cards.

* Implement gift card details screen (#408)

* Implement gift card details screen

* Add redeem for ionia gift cards

* Fix navigation after ionia opt redirection.

* Fix update gift cards list.

* Add payment status update for ionia.

* Add usage instruction to gift card.

* Add copy for ionia gift card info.

* Change version for Cake Wallet ios.

* Add localisation (#414)

* Fixes for fiat amounts for ionia.

* CW-128 marketplace screen text changes (#416)

* Change text on marketplace

* fix build issues

* fix build

* UI fixes for ionia.

* UI fixes for ionia. (#421)

* CW-129 ionia welcome screen text changes (#418)

* update welcome text

* Update localization

* Cw 133 (#422)

* UI fixes for ionia.

* Fixes for display card item on gift cards screen.

* Fix signup page (#419)

* Changed tips for ionia.

* Cw 132 (#425)

* UI fixes for ionia.

* Changed tips for ionia.

* Cw 131 (#426)

* UI fixes for ionia.

* Changed tips for ionia.

* Fixes for IoniaBuyGiftCardDetailPage screen. Renamed 'Manage Cards' to 'Gift Cards'. Hide discount badge label for 0 discount.

* Change ionia heading font style (#427)

* Fix for AddressResolver in di

* Changed build number for Cake Wallet ios.

* fix currency format for card details and routing for mark as redeemed (#431)

* fix terms and condition overflow in ionia (#430)

* fix terms and condition scroll

* fix color issues

* reuse

* refactor  widget

* Remove IoniaTokenService

* Change api for ionia to staging

* Update versions for Cake Wallet for android and ios.

* Fixes for instructions. Remove diplay error on payment status screen.

* Change build versions for Cake Wallet

* Add ionia sign in.

* Update for discounts and statuses for ionia merch.

* Fixes for qr/barcode on ionia gift card screen.

* Fixed formatting for display ionia discounts.

* Fix merchant.discount.toStringAsFixed issue

* Add savingsPercentage to ionia merch discount.

* Change build number for Cake Wallet ios and android.

* Disable ionia for haven (#440)

Co-authored-by: Godwin Asuquo <41484542+godilite@users.noreply.github.com>
2022-07-28 18:03:16 +01:00
Serhii
02533d68a0
prevent using same wallet name as existing (#391)
* Add wallet name validation
2022-06-29 18:21:21 +01:00
Omar Hatem
dc623f3293
Rework settings pickers (#398)
Updated pickers and settings screen
2022-06-29 13:38:44 +01:00
Omar Hatem
9568c5f932
QR code fullscreen (#390)
* Add fullscreen qr page flow

* Add qr fullscreen text localization

* Add package to control screen brightness when navigating to qr fullscreen and revert when leaving screen

* ios fix trial 1 - Change brightness control package

* Use package imports instead of relevant path
Add Map types
2022-06-23 10:25:00 +01:00
OmarHatem28
5a089b5893 Add Haven to welcome screen text 2022-06-18 17:10:07 +02:00