Commit Graph
879 Commits
Author SHA1 Message Date
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 HatemandGitHub 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
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
Omar HatemandGitHub 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
Godwin Asuquo 03748d680a [skip ci] format files 2022-12-01 21:21:51 +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 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
Serhii ab499c9069 Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen 2022-11-28 22:33:54 +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 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
OmarHatem 0188089bd8 Remove unused nodes list page route 2022-11-26 14:07:01 +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
Serhii d7d3b78905 refactoring mapFomString method 2022-11-23 13:47:02 +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 HatemandGitHub 9b32c9c956 CW-227 Add Disable Exchange option to settings (#642)
* Add Disable Exchange option to settings
2022-11-21 21:18:18 -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
Godwin Asuquo c67e8c5037 [CW-233] Fix missing display balance setting 2022-11-18 20:53:35 +02:00
mkyqandGitHub 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 269b4c25ab Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen 2022-11-14 11:21:06 +02:00
SerhiiandGitHub 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 4269f18d01 fix colors 2022-11-10 16:43:01 +02:00
Serhii 1f08d87471 Rework filter on the transactions list screen 2022-11-10 13:25:03 +02:00
OmarHatem ec10732eda Save node on continue 2022-11-09 19:40:12 +02:00
OmarHatem ba783982e4 Update branch to null safety
Fix Conflicts with main
2022-11-09 17:53:50 +02: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
Godwin Asuquo 85ad6fa7ab Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-161-partial-redemption-fix 2022-11-08 19:55:33 +02:00
OmarHatem f68798dd19 Move handling deep links to app root 2022-11-08 18:12:01 +02:00
Serhii dfb52223e0 fix increasing brightness
brightness decreases after leaving "gift card barcode screen"
2022-11-08 17:49:51 +02:00
OmarHatem f078457c7b Update Branch to null safety
Add deep linking to iOS
2022-11-08 16:56:27 +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
Omar HatemandGitHub 71444219be Cw 218 fix change pin using bio auth (#599)
* - push change pin page as a replacement for auth page to avoid closing it once its opened
- Add cool-down duration after popping flushbars and pushing new routes
2022-11-07 15:35:34 -05:00
Serhii 2cd748c151 filter contacts and wallets by type 2022-11-05 20:05:55 +02:00
Serhii d4c7004a3c add Disable fiat mode 2022-11-04 13:58:04 +02:00