Commit graph

437 commits

Author SHA1 Message Date
Omar Hatem
b21bcf3652
Merge pull request #657 from cake-tech/CW-66-open-app-from-qr-code
Cw 66 open app from qr code
2022-12-13 20:38:06 +02:00
Godwin Asuquo
dbf214ee1b [skip ci] fix issues from code review 2022-12-13 18:26:25 +01:00
Godwin Asuquo
0d889416d4 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-161-partial-redemption-fix 2022-12-13 06:44:34 +01: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
OmarHatem
f97a4fec28 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-239-fix-restore-from-backup-using-6-digit-pin
 Conflicts:
	lib/store/settings_store.dart
2022-12-09 20:29:50 +02:00
OmarHatem
4140742bb9 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-239-fix-restore-from-backup-using-6-digit-pin
 Conflicts:
	lib/store/settings_store.dart
2022-12-09 15:59:25 +02:00
OmarHatem
1ef8ef269c Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-118-Allow-disabling-of-fiat 2022-12-08 21:17:59 +02:00
Omar Hatem
3edba88b96
Merge pull request #667 from cake-tech/CW-271-fixed-rate-incorrect-amount
[Cw 271] fixed-rate incorrect amount
2022-12-08 21:14:54 +02:00
OmarHatem
4b1e9a10eb - Rename calculateAmount to fetchRate to be more descriptive
- Add Disable Exchange change reaction to save in shared prefs [skip ci]
2022-12-08 21:14:42 +02:00
OmarHatem
6395d6b2f7 - Add Disable fiat API option to advanced privacy settings 2022-12-08 14:10:58 +02: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
Omar Hatem
f3b89a2c7f
Merge pull request #601 from cake-tech/CW-159-Filter-address-book-by-type
[CW-159] filter contacts and wallets by type
2022-12-08 13:51:01 +02:00
Serhii
2becd32ab8 Merge branch 'CW-118-Allow-disabling-of-fiat' of https://github.com/cake-tech/cake_wallet into CW-118-Allow-disabling-of-fiat 2022-12-08 09:56:08 +02:00
Serhii
a1dd22232b [skip ci] fix fiat settings display 2022-12-08 09:56:04 +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
OmarHatem
0da48f66fe Delegate returning rate to each provider to handle its logic internally 2022-12-07 21:09:15 +02:00
Godwin Asuquo
0203f686c5 fix issue with custom redeem amount remaining 2022-12-07 18:12:45 +01:00
OmarHatem
8ff8cf38b8 Check if the provider supportsFixedRate only if fixed rate is applied [skip ci] 2022-12-07 18:15:30 +02:00
OmarHatem
c235df8935 - Fix reloading settings store
- Revert changes to backup_service.dart
2022-12-07 16:41:04 +02:00
Serhii
37ca795756 [skip ci] change fiat api UI to swich mode 2022-12-07 15:31:33 +02:00
Serhii
f4148e0989 [skip ci] rework UI for disable fiat mode 2022-12-07 12:44:08 +02:00
OmarHatem
f14c01303f - Add whether this provide supports fixed rate or not
- Fix Change now fixed rate exchange due to wrong rate id
2022-12-06 19:23:46 +02:00
Serhii
214c1fe0db Merge branch 'main' into CW-118-Allow-disabling-of-fiat 2022-12-06 17:37:12 +02:00
OmarHatem
36c2702688 - Recalculate best rate if isFixedRate changed
- check limits against the receive amount if isFixedRate
2022-12-06 13:30:11 +02:00
OmarHatem
3aa0e626ff Pass selected currency to the view model instead of the UI 2022-12-05 18:37:35 +02:00
OmarHatem
9eb8a442d8 Allow setting the new added node as the current selected node 2022-12-04 17:30:09 +02: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
707df3717d
Merge pull request #662 from cake-tech/CW-259-fix-change-now-trade
[CW-259] Fix Change now trade issue
2022-12-03 23:49:45 +02:00
Serhii
5f1e8e9d33 remove isEditable parameter 2022-12-02 23:36:22 +02:00
OmarHatem
116e468581 calculate best rate based on deposit/receive amount 2022-12-02 23:20:06 +02:00
OmarHatem
3bcd31ac44 calculate best rate based on min/max amount 2022-12-02 20:38:16 +02:00
OmarHatem
091ac41ee2 allow null minimum amount in limits 2022-12-01 22:37:13 +02:00
OmarHatem
dd99508d3e Fix static amount value for determining best rate and replace it with the input the user types 2022-12-01 22:11:51 +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
OmarHatem
914fffe51c Initialize wallet directly from constructor argument [skip ci] 2022-12-01 21:33:17 +02:00
Godwin Asuquo
03748d680a [skip ci] format files 2022-12-01 21:21:51 +02:00
Godwin Asuquo
8511805ee3 Fix correct adjusted amount for custom redeem 2022-11-30 10:00:05 +02:00
Justin Ehrenhofer
6685fb5804 [CW-257] Change Bitcoin block explorer to mempool.space 2022-11-29 11:05:38 -06: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
a5cfc7fa61 Merge branch 'main' into CW-159-Filter-address-book-by-type 2022-11-28 22:20:04 +02:00
Godwin Asuquo
3acbfbae79 Fix issues from code review 2022-11-25 22:51:07 +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
5462836b8d seperate settings view model 2022-11-23 19:06:41 +02:00
Godwin Asuquo
0fcd72f821 format indent code 2022-11-23 09:05:47 +02:00
Serhii
50d32021f6 Merge branch 'main' into CW-118-Allow-disabling-of-fiat 2022-11-22 19:48:43 +02:00
Serhii
92328c4102 move logic to viewmodels 2022-11-22 19:33:24 +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
Omar Hatem
bcf09b048c
Cw 220 fix grey exchange screen (#641)
* Fix nullability issue for ChangeNow rateId

* Handle concurrent modification error from Splay Tree
2022-11-21 20:52:03 -05:00