Commit graph

1350 commits

Author SHA1 Message Date
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
30ef231d24 Fix fill data condition 2022-12-12 22:16:46 +02:00
Justin Ehrenhofer
ab989697ab
Merge pull request #653 from cake-tech/CW-235-Today's-Transactions-disappear-after-restarting-the-app
[CW-235] fix updateTradeList bug
2022-12-12 13:30:40 -06:00
Justin Ehrenhofer
53e713a105 Move address book above security settings in menu 2022-12-12 12:51:28 -06:00
Serhii
ad33c5373d Merge branch 'main' into CW-235-Today's-Transactions-disappear-after-restarting-the-app 2022-12-12 18:57:19 +02:00
Justin Ehrenhofer
b5ba26adcd [CW-276] Privacy settings icon, name, and position 2022-12-12 10:07:37 -06:00
OmarHatem
826ae46b07 - Fix not filling fiat amount
- Fix conflicts with master
2022-12-12 18:01:42 +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
Serhii
2da50776d1 code formatting 2022-12-12 14:28:53 +02:00
Serhii
b1120cf2f8 fix filter for SideShift 2022-12-12 14:01:37 +02:00
Serhii
7d08bb0e76 Add SimpleSwap 2022-12-12 00:37:03 +02:00
Serhii
b536973077 make checkbox stateless 2022-12-12 00:07:05 +02:00
Serhii
c57507e530 redesigh checkbox 2022-12-10 12:56:37 +02:00
Serhii
ff28dfbb9c Rename Change.NOW 2022-12-10 11:40:04 +02:00
Serhii
b9ef71749e Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen 2022-12-09 23:35:14 +02:00
Godwin Asuquo
59484e5b91 Fix formatting 2022-12-09 20:19:23 +01:00
Godwin Asuquo
6836ac6d1a Fix formatting 2022-12-09 20:18:36 +01:00
Godwin Asuquo
f6c5f96929 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout 2022-12-09 19:42:36 +01: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
OmarHatem
87e72eabdf Fix conflicts with main [skip ci] 2022-12-09 20:36:51 +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
899e999d78 check nullability of wallet and disable fiat api state before updating rates [skip ci] 2022-12-09 20:04:44 +02:00
OmarHatem
fde1ea74de Remove duplicate fetching for fiat rate [skip ci] 2022-12-09 19:55:23 +02:00
OmarHatem
5310c265a7 Separate update fiat rate in a function to enhance readability [skip ci] 2022-12-09 19:41:54 +02:00
Godwin Asuquo
9ef1186c45 Fix issues from code review 2022-12-09 17:08:52 +01: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
3c1f619395 Update Settings Store attributes within reload function to get latest shared prefs data 2022-12-09 15:57:45 +02:00
OmarHatem
ae1d2a3bec Add validation on node input in advanced privacy settings 2022-12-08 21:33:14 +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
ce19be56a0 - Fix haven and litecoin fee transaction priority issue
- Revert removing fiat rate update and use it to update fiat rate periodically if Fiat API is not disabled
2022-12-08 17:23:17 +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
Omar Hatem
346376aa4e
Merge pull request #666 from cake-tech/CW-180-advanced-startup-privacy-settings
[CW 180] advanced startup privacy settings
2022-12-08 13:50:40 +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
Omar Hatem
192d45e1b2
Merge pull request #665 from cake-tech/fix-navigation-error-on-app-first-open
Fix navigation error on app first open
2022-12-08 01:26:07 +02:00
OmarHatem
d0c22aa082 - Fix Change now request missing type
- Only send either to or from amount depending on fixed rate
- take the trade amount from the response
2022-12-08 01:21:45 +02:00
OmarHatem
d2fe7b26e0 Remove unused fiat_rate_update.dart [skip ci] 2022-12-08 00:26:19 +02:00
OmarHatem
dac0b02c7d Disable updating fiat rate if the option is disabled [skip ci] 2022-12-08 00:11:09 +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
8b333f2925 - Add disable exchange to the export/import flow
- Save changes to Disable Exchange
2022-12-07 17:14:27 +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
228e157b39 [skip ci] Update localization 2022-12-07 14:04:14 +02:00
Serhii
e472c84466 Merge branch 'main' into CW-118-Allow-disabling-of-fiat 2022-12-07 12:47:38 +02:00
Serhii
f4148e0989 [skip ci] rework UI for disable fiat mode 2022-12-07 12:44:08 +02:00
OmarHatem
a9f0466825 Revert SimpleSwap changes since we disabled it for fixed rate 2022-12-06 20:10:26 +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
e65bd87f06 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-271-fixed-rate-incorrect-amount 2022-12-06 17:33:08 +02:00
Omar Hatem
50fd6accef
Merge pull request #623 from cake-tech/fix-trade-datails-screen-for-SideShift
CW-255 SideShift confirm sending screen bug
2022-12-06 17:30:05 +02:00
Omar Hatem
fa5c705bc8
Add nullability to status String [skip ci] 2022-12-06 17:29:44 +02:00
Serhii
f29f17476c add null check [skip ci] 2022-12-06 17:14:07 +02:00
OmarHatem
8514887da6 Negate is Fixed rate mode in simpleswap 2022-12-06 15:40:40 +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
Serhii
35b7c05bc1 fix null check 2022-12-06 11:41:25 +02:00
Godwin Asuquo
c156691e09 [skip ci] undo formatting in di 2022-12-05 20:14:46 +01:00
Godwin Asuquo
e4576fe699 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-225-pin-timeout 2022-12-05 19:58:42 +01:00
OmarHatem
d19f7b6d38 Remove unused state 'denied' from authentication state [skip ci] 2022-12-05 18:40:53 +02:00
OmarHatem
3aa0e626ff Pass selected currency to the view model instead of the UI 2022-12-05 18:37:35 +02:00
Omar Hatem
945dc8e859
Merge pull request #650 from cake-tech/CW-73-check-support-of-exchange-for-open-alias
[CW-73] check support of exchange for open alias
2022-12-05 16:54:07 +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
9eb8a442d8 Allow setting the new added node as the current selected node 2022-12-04 17:30:09 +02:00
OmarHatem
7e64399476 remove un-necessary attributes passing 2022-12-04 05:27:49 +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
OmarHatem
9330859177 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into fix-navigation-error-on-app-first-open 2022-12-03 23:39:07 +02:00
Omar Hatem
6be2d6f2ef
Merge pull request #648 from cake-tech/CW-251-fix-duplicate-nodes
CW-251-fix-duplicate-nodes
2022-12-03 23:38:07 +02:00
OmarHatem
98da1c221d revert nullability change with navigation in authentication state change [skip_ci] 2022-12-03 23:36:27 +02:00
OmarHatem
11a5e97711 Fix navigation error when state is changed to denied at app first start [skip_ci] 2022-12-03 23:34:23 +02:00
Serhii
4c7a0a8cb9 rework _getCurrencyImage func 2022-12-03 00:34:34 +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
d961a4645e Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-239-fix-restore-from-backup-using-6-digit-pin 2022-12-02 16:59:56 +02:00
Omar Hatem
a281124c18
Merge pull request #654 from cake-tech/CW-234-Gift-cards-filter-button-null-exception
[CW-234] gift cards filter button null exception
2022-12-02 15:03:33 +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
OmarHatem
cbe31aa5aa Revert allowing nullable values for input and refund addresses 2022-12-01 18:21:19 +02:00
OmarHatem
47764835c3 Fix nullability issue in create trade response 2022-12-01 18:09:21 +02:00
Omar Hatem
c547295a02
Merge pull request #658 from cake-tech/CW-257-bitcoin-explorer-mempool.space
[CW-257] Change Bitcoin block explorer to mempool.space
2022-12-01 17:26:41 +02:00
OmarHatem
ffd0079e1d Check if user already has onion node before adding it 2022-12-01 14:29:03 +02:00
Serhii
292c4c396c remove HUSD and rename BTTBSC 2022-11-30 23:53:57 +02:00
Godwin Asuquo
34cfe7591f Fix authentication required when minimize app 2022-11-30 22:57:48 +02:00
Godwin Asuquo
8511805ee3 Fix correct adjusted amount for custom redeem 2022-11-30 10:00:05 +02:00
OmarHatem
59ee7aa975 Add onion node to already existing users 2022-11-30 01:37:56 +02:00
Serhii
fa91ccfdbf Merge branch 'main' into fix-trade-datails-screen-for-SideShift 2022-11-29 20:05:38 +02:00
Serhii
5cb4b7e2d4 Merge branch 'main' into fix-trade-details-screen-UI 2022-11-29 20:04:44 +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
Godwin Asuquo
2eb9db4ca6 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-161-partial-redemption-fix 2022-11-29 17:06:35 +02:00
OmarHatem
03ea516e63 Add initial alert for errors 2022-11-29 14:03:14 +02:00
Serhii
ab499c9069 Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen 2022-11-28 22:33:54 +02:00
Serhii
1a420a7470 Merge branch 'main' into CW-221-Change-synchronization-status-text 2022-11-28 22:24:25 +02:00
Serhii
189a886fe2 Merge branch 'main' into CW-175-Refactoring-of-crypto-currency-list 2022-11-28 22:21:59 +02:00
Serhii
a5cfc7fa61 Merge branch 'main' into CW-159-Filter-address-book-by-type 2022-11-28 22:20:04 +02:00
Serhii
84c563a922 Merge branch 'main' into CW-167-Custom-redeem-screens-fix 2022-11-28 22:13:15 +02:00
Serhii
87cdd128ef Merge branch 'main' into CW-234-Gift-cards-filter-button-null-exception 2022-11-28 22:04:47 +02:00
Godwin Asuquo
36bf614b4c Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-239-fix-restore-from-backup-using-6-digit-pin 2022-11-28 19:00:33 +02:00
Godwin Asuquo
dca2d94f1f Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-73-check-support-of-exchange-for-open-alias 2022-11-28 18:43:37 +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
OmarHatem
a51384bd06 Remove unused nodes_list_page.dart 2022-11-28 14:04:03 +02:00
Serhii
ec15a9b229 fix updateTradeList bug 2022-11-28 00:53:20 +02:00
OmarHatem
51ea377a52 Temporarily comment run app on error of run zone guard 2022-11-27 14:44:35 +02:00
OmarHatem
79fb1b91d4 Check for Nodes if exists before adding them in nodes
Fix nullability issue due to early access
Fix Nodes_list,yml file structure
2022-11-26 16:13:54 +02:00
OmarHatem
0188089bd8 Remove unused nodes list page route 2022-11-26 14:07:01 +02:00
OmarHatem
08edd4d8ff Add types for OtherSettingsViewModel dependencies 2022-11-26 02:33:37 +02:00
Godwin Asuquo
3acbfbae79 Fix issues from code review 2022-11-25 22:51:07 +02:00
OmarHatem
7b99e409a9 Send error file via email 2022-11-25 18:59:47 +02:00
Godwin Asuquo
7874009854 Fix restore from backup using 6 digit-pin 2022-11-24 16:34:29 +02:00
OmarHatem
34746c31c8 Save exceptions to local file 2022-11-24 16:27:29 +02:00
OmarHatem
68c20641b9 Save exceptions locally 2022-11-23 23:02:18 +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
OmarHatem
38da6e73d4 Wrap app in zone guard 2022-11-23 18:06:09 +02:00
Serhii
d7d3b78905 refactoring mapFomString method 2022-11-23 13:47:02 +02:00
Godwin Asuquo
0fcd72f821 format indent code 2022-11-23 09:05:47 +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
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
Serhii
2db7534480 small fix 2022-11-22 00:07:27 +02:00
Serhii
05f1b17a73 fix contact list bug 2022-11-21 22:41:09 +02:00
Serhii
1a089eaa60 Merge branch 'main' into CW-159-Filter-address-book-by-type 2022-11-21 22:03:06 +02:00
Serhii
19c8a421b2 Merge branch 'main' into CW-221-Change-synchronization-status-text 2022-11-21 13:39:57 +02:00
Godwin Asuquo
c67e8c5037 [CW-233] Fix missing display balance setting 2022-11-18 20:53:35 +02:00
OmarHatem
a82803de3a Fix Casting issue 2022-11-18 20:32:52 +02:00
mkyq
ab305e22a2
Remove duplication for qr codes. (#628) 2022-11-16 18:30:35 -05:00
Serhii
91d7e87334 fix gift card filter colors 2022-11-16 23:31:42 +02:00
Godwin Asuquo
549975ecc1 Reorganize settings 2022-11-16 09:29:14 +02:00
Serhii
9ce8a1944b fix empty containers 2022-11-14 22:50:07 +02:00
Serhii
3f5c637b18 Merge branch 'main' into CW-221-Change-synchronization-status-text 2022-11-14 12:02:33 +02:00
Serhii
269b4c25ab Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen 2022-11-14 11:21:06 +02:00
Serhii
74cbb6f001 fix UI with new design CW-138 2022-11-13 21:18:01 +02:00
Serhii
6988637266 fix fetching trade state for SideShift 2022-11-13 20:06:45 +02:00
Godwin Asuquo
668e9fcf07 [CW-73] Fix matching .exchange domain to openAlias 2022-11-11 15:55:21 +02:00
Serhii
7d49dc4761
rework confirm sending screen for cake pay (#603)
* rework confirm sending allert

* remove confirm_modal.dart

* fix  text color and buttons size
2022-11-10 13:08:52 -05:00
Serhii
bf86fd6ed0 update localization 2022-11-10 17:38:23 +02:00