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 |
|
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 |
|
Omar Hatem
|
f2ea86a713
|
Merge pull request #652 from cake-tech/CW-239-fix-restore-from-backup-using-6-digit-pin
[CW-239] fix restore from backup using 6 digit pin
|
2022-12-09 20:37:31 +02: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 |
|
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 |
|
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 |
|
Omar Hatem
|
ee779421c3
|
Merge pull request #613 from cake-tech/warning-wording
CW-274 Improve warning wording
|
2022-12-09 19:16:39 +02:00 |
|
Godwin Asuquo
|
9ef1186c45
|
Fix issues from code review
|
2022-12-09 17:08:52 +01:00 |
|
Justin Ehrenhofer
|
1fc4f809e5
|
Merge branch 'main' into warning-wording
|
2022-12-09 08:44:30 -06: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
|
c757a06293
|
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-07 12:47:46 +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 |
|
Omar Hatem
|
117a8beec4
|
Fix localization generation error
|
2022-12-06 19:40:39 +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 |
|