Commit graph

374 commits

Author SHA1 Message Date
Serhii
93eda7c206
CW-417-Additional-callouts (#976)
* add available balance description

* add sync description

* Update URL [skip-ci]

* Update balance_page.dart

---------

Co-authored-by: Justin Ehrenhofer <justin.ehrenhofer@gmail.com>
2023-07-07 14:47:55 +03:00
Serhii
a7ba4a84e8
CW-398-MoonPay-offramp-(Sell)-improvements (#964)
* Implement MoonPay offramp widget

* Add Litecoin to strings

* improve webview page

* Rename route string

---------

Co-authored-by: Justin Ehrenhofer <justin.ehrenhofer@gmail.com>
Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
2023-06-14 02:15:10 +03:00
Mathias Herberts
8747d2fe59
Fixed for v4.6.4 (#955) 2023-06-05 16:41:15 +03:00
Mathias Herberts
5e270df568
Fixed 2FA related French localization (#956) 2023-06-05 16:40:34 +03:00
Godwin Asuquo
75c65d67bf
CW-404 Add yoruba language (#946)
* Add Yoruba translation

* Add Yoruba localization

* Rename flag
2023-05-25 20:30:21 +03:00
Justin Ehrenhofer
53c55523c2
Ionia don't->didn't (#941) 2023-05-24 19:02:28 +03:00
Godwin Asuquo
1ac74b3182
CW-388 Add hausa language (#936)
* Add hausa language

* Add hausa language

* Add cupertino delegete

* Add flag to git

* - Fix hausa_intl.dart issue
- Fix menu items not updating properly
- Fix Nav bar issue

---------

Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
2023-05-19 17:33:16 +03:00
Adegoke David
43e062d1ac
Cw-263-TOTP-2FA-In-Security-Settings (#892)
* CW-263-TOTP-2FA-in-security-settings WIP

* Implement TOTP 2FA WIP

* Implement TOTP 2FA Authentication

* chore: Remove unneeded formatting

* revert formatting

* fixes

* CW-263-TOTP-2FA-in-security-settings WIP

* Setup TOTP Complete, left with Modify TOTF

* CW-263-TOTP-2FA-in-security-settings

* CW-263-TOTP-2FA-in-security-settings

* CW-263-TOTP-2FA-in-security-settings

* fix: Add copy-to-clipboard for qr secret key

* fix: Translation

* chore: Move strings into translation files

* feat: End to end flow for TOTP

* hotfix: Switch totp to use sha512

* Update strings; 8 digits and error explanation

* fix: Totp 2fa implementation feedback

* hotfix: same action for button and alert close

* feat: App should show both normal and totp auths when totp is enabled

* hotfix: prevent barrier from dismissing

* fix: Changes requested during PR review

* - Minor Enhancements
- Minor UI fixes

---------

Co-authored-by: Justin Ehrenhofer <justin.ehrenhofer@gmail.com>
Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
2023-05-17 17:43:23 +03:00
Rafael Saes
7fa7c45c0c
CW-370-add-options-to-enable-disable-buy-and-sell-actions (#920)
* feat: In the privacy settings screen, add 2 options to Enable/Disable Buy and Sell actions

* fix: add strings

* fix: add the rest of the strings

* fix: disable instead of hide buy & sell buttons

* fix: use disableSell

* fix: main actions able to be onTapped even when disabled
2023-05-15 15:26:56 +03:00
Serhii
1eb8d0c698
CW-229 Improved restore options from QR code (#793)
* add restoring wallet from qr

* add restore mode

* add alert for exceptions

* add restore from seed

* add check for create wallet state

* convert sweeping page into stateful

* fix parsing url

* restoration flow update

* update restoring from key mode

* update config

* fix restor of BTC and LTC wallets

* fix pin code issue

* wallet Seed/keys uri or code fix

* fix key restore credentials

* update the restore workflow

* update from main

* PR coments fixes

* update

* update

* PR fixes
2023-04-21 20:36:47 +02:00
Serhii
315c4c911c
CW-325-Coin-Control-enhancements (#846)
* fix checkbox

* save the output state

* add note as a header

* Allow copy the Amount and Address

* add frozen balance to dashboard

* add block explorer

* fix url launcher

* code formatting

* minor fixes

* Revert "minor fixes"

This reverts commit d230b6a07b.

* fix missing implementations error

* [skip ci] update localization

* fix unspent with same txid

* add amount check

* add vout check

* remove formattedTotalAvailableBalance

* remove unrelated mac os files
2023-04-20 15:46:41 +02:00
Serhii
f26815efb8
CW-351-Add-option-in-Privacy-settings-to-enable-disable-screenshots (#885)
* add prevent screenshots option

* fix prevent screen recording

* update localization

* Update strings_ja.arb
2023-04-20 11:59:59 +02:00
Adegoke David
7b91b0e938
Cw 262 better handle user exchange amount below minimum or maximum trade size (#868)
* CW-262-Better-handle-user-exchange-amount-below-minimum-or-maximum-trade-size

* fix: App should compute conversion even if it's not within the limits
2023-04-20 03:13:37 +02:00
Adegoke David
4a203a43c8
CW-331-Add-option-to-disable-market-place-in-display-settings (#872)
* CW-331-Add-option-to-disable-market-place-in-display-settings [skip ci]

* CW-331-Add-option-to-disable-market-place-in-display-settings [skip ci]
2023-04-16 15:45:35 +02:00
Omar Hatem
c5477e4f9e
Dashboard desktop view (#737)
* Add build scripts for macOS. Add macos for cw_monero plugin. Add macos proj to the application.

* - Update Flutter secure storage to work with macos
- Enable uni links only on Mobile
- Update devcelocale to work with macos

* Add network access to mac

* Change Dashboard view on desktop size screens

* Add on Tap to desktop_action_button.dart
Remove unused functions

* Fix arch match for monero lib for darwin x86_64 -> x86-64

* Add Bundle ID in entitlements files through app config script

* Update deployment target to 10.13

* Revert back to Cake fork for secure storage

* Revert back to Cake fork for secure storage

* Revert mac os version

* Revert mac os version

* Add platform channel specific code for mac os

* Add desktop sidebar

* [skip ci] Add desktop sidebar

* [skip ci] Add desktop sidebar

* - Remove legacy migration from macos
- Remove wake lock native code and just use the ready made package

* Remove wake lock native code and just use the ready made package

* Remove unstoppable domain from macos since it's not supported

* Temporarily fetch unstoppable domains only on mobile

* refactor desktop settings sidebar

* Ignore increasing brightness for non-mobile platforms

* Add Wallet selection dropdown to dashboard desktop view

* Generate MacOS icons

* localize settings

* fix dashboard sidebar and responsive utils

* Change Mac os app name and bundle id

* Fix exchange page as fullScreenDialog

* Remove constants

* - Refactor onRamper to have a single point of modification
- Enlarge initial app size
- update Flutter and Packages

* Add pubspec.lock and Podfile.lock to gitignore

* Remove Podfile.lock from cache

* Fix bug on sidebar reset

* Fix issues from code review

* [skip ci] reformat desktop dashboard

* [skip ci] reformat desktop dashboard

* Revert removing .lock files

* Revert changes in .gitignore

* [skip ci] remove .project changes

* [skip ci] remove .project changes

* Separate Dashboard desktop view from mobile view

* constraint images and pincoded box

* Remove drawer from mac os

* - Listen to keyboard events in PIN screen
- Fix PIN buttons style

* Fix desktop nav bar UI

* Add Marketplace to dashboard view

* Update trailing icon to open transaction page

* Update widget contraints

* Add empty trailing to center page title on desktop

* Refresh desktop dashboard actions on wallet change

* Change ionia welcome page animation

* Fix Constrained width screens UI

* Refactor sidebar state management

* remove empty line

* Add max width constrain to Welcome page

* Change Exchange page UI depending on platform

* - Change design/paddings for Send page on desktop view
- Make AddTemplateButton instead of having it duplicated in send/exchange

* Fix Desktop dashboard actions background color

* Constrain primary Buttons width

* Make side menu items toggle back to dashboard

* Add padding to support page

* Add width constraints to desktop dashboard

* Fix UI issues, paddings and alignments

* Rename misleading variable
Change initial mac window size

* Fix wallet create in settings

* remove unnecessary code

* remove unnecessary code

* Remove duplicated constrains

* - Use close icon on main screens
- Minor UI fixes

* fix pageview controller reset index

* Add create and restore wallet options to dropdown menu

* Fix desktop background color and address book view issues

* Fix input field

* Add onFieldSubmitted to allow "enter" button interaction

* Fix issue from code review

* Fix Popup width constraint and add focus orders

* Fix variable name

* Fix issues from code review

* refactor dropdown items

* Fix alignment in create and restore wallet screens

* Fix dropdown change state bug

Hide scanner for desktop

* remove space

* override navbar with desktopnavbar

* Remove autofocus

* remove unused code

* Fix ionia input field alignment

* Replace removed code

* Add app lock feature on mac

* Add assertion to avoid null

* Add Nano currency image

* Enable adding contact from send screen

* Fix UI issues
Add missing translation

* pop only PIN screen after successful auth

* Add back wallet settings page to desktop settings actions

* Fix Navigation animation for settings screens

* Fixate MobX version to fix restore issue

* CW-324 Refresh current settings page if wallet changed (#811)

* Fix refresh current settings page if wallet changed

* Fix refresh current settings page if wallet changed

* Refresh Wallet Seeds/Keys List upon wallet change

---------

Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>

* Remove navigation workaround for duplicate key, and fix the issue by handling creation/disposing of global key (#840)

* Cw 323 add wallet list to settings on mac (#843)

* Remove navigation workaround for duplicate key, and fix the issue by handling creation/disposing of global key

* - Register Wallet List as singleton in Desktop to be modify the same instance from settings and dropdown
- General Fixes and Enhancements

* Fix Changing/Restoring wallet from settings

* Fix Create wallet not showing seeds screens if launched from settings

* Add max width constraint for Alerts

* - Add Desktop API keys
- Fix Change back up password issue
- Fix Popup width

* Sync Mac with latest main updates

* Swap Transactions icon with lock icon

* Save backup file locally on desktop

* Sync with latest main updates

* Fix Navigation issues with anonpay

* Update macos build version

* Remove deprecated custom wake lock code for Android

* Remove Legacy CryptoSwift package from MacOS

* - Refactor Payfura page code
- Add OnRamper new configs to onramper_buy_provider.dart
- Fix Conflicts with main

* Updated device locale package

* Update android tools

* Revert changes and update only gradle version

* Downgrade android tools version

* Update gradle version

* Update package/gradle/plugin version

* - Fixate device locale version
- Downgrade gradle version

* Update kotlin version

* Update gradle version

* Trial for a custom fork from devicelocale

* Fixate shared preferences package version

* Revert gradle version

* Revert kotlin version

* Downgrade gradle version

* Downgrade gradle version

* Repair cache and clean before build

* Fixate flutter version

* update google services version

* revert google services version

* Force shared pref android version

* Override shared prefs android package version

* Override shared prefs android package [skip ci]

---------

Co-authored-by: M <m@cakewallet.com>
Co-authored-by: Godwin Asuquo <godilite@gmail.com>
Co-authored-by: Godwin Asuquo <41484542+godilite@users.noreply.github.com>
2023-04-14 06:39:08 +02:00
Mathias Herberts
5c4fd78951
French translation fixes post 4.6.2 (#871)
* Minor French translation fixes

* Minor fixes to French translation
2023-04-11 17:12:48 +02:00
Serhii
72df78ad8c
CW-335-Add-Payfura-widget-for-XMR-Buy (#857)
* add payFura widget

* Update pr_test_build.yml

* Change Buy strings

Also add Sell string to ZH, which was missing

* minor fixes

* update alert for monero.com

---------

Co-authored-by: Justin Ehrenhofer <justin.ehrenhofer@gmail.com>
Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
2023-03-31 20:34:39 +02:00
Godwin Asuquo
3006679560
Cw 314 trocador receive screen update (#823)
* Change receive screen ui

* Upgrade flutter packages

* revert Upgrade flutter packages

* revert Upgrade flutter packages

* Adjust flow for anon invoice page navigation

* Add receive screen ui

* Implement anonpay invoice

* Add invoice detail to transactions page

* Implement donation link

* Fix transaction filter and details view

* Save donation link

* Fix transaction display issues

* Fix formatting

* Fix merge conflict

* Fix localization

* Fix transaction amount display

* Fix transaction limit for fiat

* Update fix from code review

* Fix issues from code review

* Make amountTo nullable to avoid potential

* Remove encoding for description in donation link

* Remove optional params from request

* Fix QR image version

* Refactor QRCode, fix issues from code review

* Pass version to QRCode full page

---------

Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
2023-03-24 17:26:42 +02:00
Serhii
7dfc5b23bc
CW-243-Better-error-message-for-too-many-decimals (#818)
* update amoung validation

* fix decimal validator

* minor fix
2023-03-15 19:22:08 +02:00
Serhii
f458e5b349
CW-277-Allow-editing-nodes (#827)
* allow editing nodes

* fix buttons size

* fix comments
2023-03-15 15:24:38 +02:00
cppethereum
cf25878a61
Merge branch 'main' into add-indonesian-language 2023-03-01 10:04:47 -05:00
Omar Hatem
e8335fc316
Merge pull request #762 from holecekp/main
Add Czech language
2023-03-01 05:04:21 +02:00
OmarHatem
f65f7b892c Fix translation issue [skip ci] 2023-02-28 18:13:21 +02:00
holecekp
c14fd50625 Merge remote-tracking branch 'remotes/upstream/main' 2023-02-28 16:44:44 +01:00
cr0mll
11da732ad1
Merge branch 'main' into bulgarian_support 2023-02-28 09:57:48 +02:00
cr0mll
cf5cee946b Added Bulgarian language 2023-02-25 19:34:23 +02:00
Waffle Man
e099133ae8
Merge branch 'cake-tech:main' into main 2023-02-24 14:56:55 +02:00
holecekp
4444a075c6 Add Czech language 2023-02-04 15:42:41 +01:00
Serhii
50f1c051f9 Merge branch 'main' into CW-302-Update-Cake-Pay-checkout-wording-for-Bitcoin-only 2023-02-02 12:54:15 +02:00
Waffle Man
3cc6b1b42b
update_urdu 2023-02-02 01:53:56 +02:00
Waffle Man
c0115b1b77
Merge branch 'cake-tech:main' into main 2023-02-01 20:15:15 +02:00
Waffle Man
cf83d0ca8c
init_urdo 2023-02-01 20:14:26 +02:00
Omar Hatem
2268e89b19
Merge pull request #743 from cake-tech/CW-287-Get-Address-from-twitter-bio
CW-287 get address from twitter bio
2023-02-01 19:40:49 +02:00
Serhii
ef01554fdb fix openAlias address resolv 2023-01-31 21:39:08 +02:00
cppethereum
8eba55d114
Indonesian translation strings 2023-01-28 00:37:25 -05:00
Serhii
cce56a61a3 minor fixes 2023-01-26 13:33:33 +02:00
Serhii
71d5a9b790 Merge branch 'main' into CW-247-Exchange-confirmation-screen-address-labels 2023-01-26 11:54:03 +02:00
Serhii
084659e052 minor fixes 2023-01-25 19:15:18 +02:00
Serhii
9ec006bb03 Merge branch 'main' into CW-302-Update-Cake-Pay-checkout-wording-for-Bitcoin-only 2023-01-25 18:31:30 +02:00
Serhii
9f5438d2f4 update localization files 2023-01-25 12:28:44 +02:00
OmarHatem
477d46b1d2 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-237-enhance-error-catching-reporting 2023-01-24 03:03:07 +02:00
HardenedSteel
c647129e8b fix accidentally translated parameter + add Turkish to ReadME.md 2023-01-20 12:30:33 +03:00
Omar Hatem
e6f562b43e
Merge branch 'main' into main 2023-01-19 16:10:17 +02:00
qweewqi
76bf0d2dee
update_mmr 2023-01-19 03:42:41 +02:00
qweewqi
e022d4dfcf
mmr lang 2023-01-19 03:36:48 +02:00
Mathias Herberts
d32cac7a9b Merge branch 'main' into fr.fixes.v4.5.6 2023-01-15 17:50:09 +01:00
Serhii
7f37bd3d59 update localization files 2023-01-14 23:29:47 +02:00
Serhii
569516ce57 minor fixes 2023-01-13 16:39:33 +02:00
Serhii
2115cc045f [skip ci] update localization 2023-01-13 15:47:52 +02:00
Serhii
25a71fa31e Merge branch 'main' into CW-252-Add-notice-when-connecting-to-.onion-node 2023-01-13 15:43:29 +02:00
HardenedSteel
1c139386a7 Add Turkish Language 2023-01-12 05:45:30 +03:00
Mathias Herberts
8be2079b02 Minor changes for a more natural feel 2023-01-11 09:44:27 +01:00
Omar Hatem
d8ba269e94
Merge pull request #717 from Telsbat/patch-1
Update strings_pl.arb
2023-01-10 04:06:53 +02:00
OmarHatem
fcde1bd7b6 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-237-enhance-error-catching-reporting
 Conflicts:
	README.md
2023-01-10 01:46:05 +02:00
OmarHatem
e4af355b24 Fix Translation typo [skip ci] 2023-01-09 20:31:24 +02:00
OmarHatem
a373253fd2 Add localizations for error dialog content 2023-01-09 18:16:50 +02:00
Telsbat
f1688703f2
Update strings_pl.arb 2023-01-09 17:08:17 +01:00
Telsbat
d227e6e97e
Update strings_pl.arb
Almost everything was from some online translator. I've translated everything that was no sense.
2023-01-09 15:04:44 +01:00
xd
c11be70948 Merge branch 'main' of https://github.com/cake-tech/cake_wallet 2023-01-06 17:27:18 +02:00
xd
15d5375eb6 Add Support for Arabic Language 2023-01-06 17:14:33 +02:00
OmarHatem
5e96c387a2 Add Thai translation for contact list [skip ci] 2023-01-06 15:22:00 +02:00
OmarHatem
bcdf48d158 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into add-missing-translations 2023-01-06 15:19:55 +02:00
Omar Hatem
71350c2953
Merge pull request #698 from maddymodd/main
Add thai language localization file
2023-01-06 15:19:29 +02:00
rosedaler
0b5b74943c Update strings_th.arb 2023-01-06 07:57:04 -05:00
OmarHatem
23490b088f Translate contact list for other languages 2023-01-06 14:40:35 +02:00
rosedaler
21dfe86da0 Update strings_th.arb 2023-01-05 21:21:10 -05:00
Mathias Herberts
de4ecefd20 Added localized strings in contact list 2023-01-05 22:44:19 +01:00
Mathias Herberts
768320003c Fixed FR translations. Added localized strings in contact list 2023-01-05 22:39:32 +01:00
rosedaler
7551181b09 Add thai language localization file 2023-01-05 11:39:08 -05:00
Serhii
e53602afa3 Add alert for onion nodes 2023-01-05 12:53:05 +02:00
Omar Hatem
9bd0de6d08
Merge pull request #625 from cake-tech/CW-122-Rework-filter-on-the-transactions-list-screen
[CW-122] rework filter on the transactions list screen
2022-12-28 20:50:17 +02:00
Serhii
d893562dad update localization 2022-12-24 01:09:54 +02:00
OmarHatem
e005e2aed7 Add Cake Pay Web Card to marketplace 2022-12-21 19:15:02 +02:00
Serhii
00c008ed8b Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen 2022-12-16 15:14:13 +02:00
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
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
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
Omar Hatem
117a8beec4
Fix localization generation error 2022-12-06 19:40:39 +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
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
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