Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-12-22 11:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Squashed commit of the following:

Browse source 
commit 9c64229673787c7a73b12a12954fd11c742fe1ce
Author: Rafael Saes <git@saes.io>
Date:   Thu Sep 7 11:40:17 2023 -0300

    merges

commit dcebe3ee66
Merge: 1b3b7b35 e39d5c6a
Author: Rafael Saes <git@saes.io>
Date:   Wed Sep 6 18:26:59 2023 -0300

    merges

commit e39d5c6af4
Author: Rafael Saes <git@saes.io>
Date:   Wed Sep 6 17:44:55 2023 -0300

    Merge main into cw-linux

commit 39cfa265b0
Author: Rafael Saes <76502841+saltrafael@users.noreply.github.com>
Date:   Thu Aug 31 11:39:46 2023 -0300

    Cw 474 linux swapping wallets btc then xmr still shows btc receive qr code (#1068)

    * feat: improve address page txt field

    * fix: switching wallets from the desktop dropdown updates dashboard pages

    * Revert "feat: improve address page txt field"

    This reverts commit 0a30e6d9e1.

    * refactor: rename to WalletChangeListener

    * fix: _init also behaves on wallet change

commit 39d3499d07
Author: Rafael Saes <git@saes.io>
Date:   Wed Sep 6 16:05:26 2023 -0300

    Merge remote-tracking branch 'origin/linux/password-direct-input' into cw-linux

commit 1b3b7b357e
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Sat Sep 2 04:19:03 2023 +0300

    Fetch new changes
    Fix conflicts
    Update Linux version

commit 9687876c32
Merge: bd987a8d 70d32aa5
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Sat Sep 2 04:08:55 2023 +0300

    Merge branch 'v4.9.0_v1.6.0' of https://github.com/cake-tech/cake_wallet into cw-linux

     Conflicts:
    	cw_core/lib/hive_type_ids.dart
    	cw_core/lib/wallet_info.dart
    	cw_core/pubspec.lock
    	cw_monero/lib/monero_wallet.dart
    	lib/entities/default_settings_migration.dart
    	lib/main.dart
    	lib/src/screens/dashboard/widgets/address_page.dart
    	lib/src/screens/settings/display_settings_page.dart
    	lib/store/settings_store.dart
    	tool/append_translation.dart

commit 70d32aa503
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Sep 1 21:16:58 2023 +0300

    New versions

commit bd987a8d04
Author: Rafael Saes <76502841+saltrafael@users.noreply.github.com>
Date:   Thu Aug 31 11:39:46 2023 -0300

    Cw 474 linux swapping wallets btc then xmr still shows btc receive qr code (#1068)

    * feat: improve address page txt field

    * fix: switching wallets from the desktop dropdown updates dashboard pages

    * Revert "feat: improve address page txt field"

    This reverts commit 0a30e6d9e1.

    * refactor: rename to WalletChangeListener

    * fix: _init also behaves on wallet change

commit 256c48d61a
Author: Rafael Saes <git@saes.io>
Date:   Mon Aug 28 16:44:03 2023 -0300

    fix: string conflicts issues

commit 3751d045a3
Merge: 99998168 2bce18d2
Author: Rafael Saes <git@saes.io>
Date:   Mon Aug 28 16:35:32 2023 -0300

    Merge remote-tracking branch 'origin/linux/password-direct-input' into cw-linux

commit 2bce18d240
Author: Rafael Saes <76502841+saltrafael@users.noreply.github.com>
Date:   Wed Aug 23 20:30:21 2023 -0300

    Linux flutter upgrade (#1054)

    * V4.8.1 v1.5.1 (#1038)

    * Revert "Cw 397 chatwoot live support (#1011)"

    This reverts commit af9b5ff10c.

    * Add Version 4.8.1 configs

    * Update macos build version [skip ci]

    * Re add chatwoot (#1044)

    * Revert "Revert "Cw 397 chatwoot live support (#1011)""

    This reverts commit ecdc7baa2e.

    * Re-add chatwoot
    Change chatwoot base url

    * Cw 396 additional themes (#962)

    * fix: SectionStandardList using BuildContext as param

    * refactor: deprecated backgroundColor -> colorScheme.background

    * refactor: themeBase and current themes

    * refactor: accentTextTheme.titleLarge.color -> dialogTheme.backgroundColor

    * refactor: gradient background

    * refactor: text themes using the same color as primaryColor

    * refactor: accentTextTheme.bodySmall.color -> cardColor

    * refactor: text themes using same dialogBackgroundColor

    * refactor: scrollbarTheme

    * refactor: create SyncIndicatorTheme

    * refactor: SectionDivider

    * refactor: base_page improvements and simplify

    * refactor: collapsible_standart_list improvements

    * refactor: accentTextTheme.bodyLarge.backgroundColor -> KeyboardTheme.keyboardBarColor

    * refactor: create PinCodeTheme for accentTextTheme.bodyMedium

    * refactor: create SupportPageTheme for accentTextTheme.displayLarge.backgroundColor and fix cases that use it

    * refactor: accentTextTheme.displayLarge.color -> disabledColor

    * refactor: create ExchangePageTheme

    * refactor: create DashboardPageTheme and use textColor

    * refactor: create NewWalletTheme for accentTextTheme.displayMedium

    * refactor: create BalancePageTheme for accentTextTheme.displaySmall.backgroundColor

    * refactor: create AddressTheme for accentTextTheme.displaySmall.color

    * refactor: create IndicatorDotTheme

    * refactor: create CakeMenuTheme

    * refactor: create FilterTheme

    * refactor: create WalletListTheme

    * refactor: accentTextTheme.bodySmall.decorationColor -> InfoTheme.textColor

    * refactor: accentTextTheme.titleLarge.backgroundColor -> PickerTheme.dividerColor

    * refactor: primaryTextTheme.bodyLarge.backgroundColor -> AlertTheme.leftButtonTextColor

    * refactor: primaryTextTheme.displayLarge.backgroundColor -> OrderTheme.iconColor

    * refactor: create SendPageTheme

    * fix: missing migrated styles

    * refactor: primaryTextTheme.labelSmall.decorationColor -> PlaceholderTheme.color

    * refactor: create TransactionTradeTheme

    * refactor: create CakeTextTheme

    * refactor: create AccountListTheme

    * refactor: create ReceivePageTheme

    * refactor: create QRCodeTheme

    * refactor: move remaining items to CakeTextTheme and some missing fixes

    * feat(display_settings): add new theme selector

    * feat: additional themes

    * fix: conflict error

    * fix(lag): move colorScheme initialization to constructor

    * feat: add backdropColor to alert and picker backdrop filters

    * fix: merge fixes

    * fix: send template page missing new colors

    * fix: anonpay pages title and icon colors

    * fix: merge fixes

    * fix: unspent coins page

    * fix: also fix exchange template

    * fix: missing checkbox

    * fix: fixes for high contrast theme

    * Merge branch 'main' into CW-396-additional-themes

    * fix: merge fixes

    * fix: .gitignore and rm added files

    * Fix review comments

    ---------

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

    * Flutter update (#1048)

    * Update Flutter
    Update packages

    * Fix localization issues
    Fix UI issues
    Update old packages
    Update workflow
    Update how to build guide

    * Additional UI fixes for merged conflicts

    * Fix Ethereum network for anonpay invoice (#1051)

    * build: migrate from wakelock to wakelock_plus

    - plus is compatible with package_info_plus ^4.0.0
    - plus has implemented Linux support

    * fix: theme & support view model merge fixes

    ---------

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

commit 8cf2715539
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Aug 11 19:18:43 2023 +0300

    Merge new version changes
    Update Linux version

commit 9af7e146a4
Merge: cb295333 6d812c99
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Aug 11 19:17:23 2023 +0300

    Merge branch 'v4.8.1_v1.5.1' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

     Conflicts:
    	lib/entities/main_actions.dart

commit 6d812c999b
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Aug 11 17:33:38 2023 +0300

    Add Version 4.8.1 configs

commit ecdc7baa2e
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Aug 11 17:30:24 2023 +0300

    Revert "Cw 397 chatwoot live support (#1011)"

    This reverts commit af9b5ff10c.

commit cb295333af
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Tue Aug 8 16:58:07 2023 +0300

    Add Encryption file utils to Ethereum (#1025)

commit 5ce1fbb1e4
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Mon Aug 7 20:40:51 2023 +0300

    Add Ethereum to Linux
    Fix conflicts with main

commit d106e14e74
Merge: 9164d05f d1684f5b
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Mon Aug 7 20:23:27 2023 +0300

    Merge branch 'main' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

     Conflicts:
    	cw_bitcoin/pubspec.yaml
    	cw_core/lib/wallet_base.dart
    	cw_monero/ios/Classes/monero_api.cpp
    	lib/core/backup_service.dart
    	lib/core/wallet_loading_service.dart
    	lib/di.dart
    	lib/main.dart
    	lib/router.dart
    	lib/src/screens/exchange/exchange_page.dart
    	lib/src/screens/send/send_page.dart
    	lib/src/screens/settings/security_backup_page.dart
    	lib/src/screens/setup_2fa/setup_2fa_enter_code_page.dart
    	lib/src/screens/wallet_list/wallet_list_page.dart
    	lib/src/widgets/address_text_field.dart
    	lib/store/settings_store.dart
    	lib/view_model/exchange/exchange_view_model.dart
    	lib/view_model/wallet_creation_vm.dart
    	lib/view_model/wallet_new_vm.dart
    	res/values/strings_yo.arb
    	tool/configure.dart

commit 9164d05fee
Merge: 8a7ef39f e34ba6cf
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Jul 14 23:33:35 2023 +0300

    Merge branch 'main' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

     Conflicts:
    	assets/text/Monerocom_Release_Notes.txt
    	assets/text/Release_Notes.txt
    	ios/Podfile.lock
    	lib/utils/exception_handler.dart
    	scripts/android/app_env.sh
    	scripts/ios/app_env.sh
    	scripts/macos/app_env.sh

commit 8a7ef39f19
Author: Rafael Saes <76502841+saltrafael@users.noreply.github.com>
Date:   Fri Jul 14 17:28:01 2023 -0300

    Linux: fixes for wallet rename (#1000)

    * fix: missing MarketPlaceViewModel register

    * fix: no auth route on wallet list _loadWallet

    * fix: fixes for wallet rename with password flow

    * fix: missing monero condition

    * fix: navigator pop

    * fix: going back case

commit 62007975e1
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Fri Jul 14 01:48:47 2023 +0300

    Old state (#999)

    * Fix Bitcoin transactions not showing (#978)

    * handle multiple responses coming in a single event

    * Add timeout for getting transaction info, to allow other transactions to be returned in case of any failure or network issue

    * Handle other cases of receiving multiple messages in the same response

    * Fix shib and storj (#997)

    * Merge main branch

    * Add missing files

    ---------

    Co-authored-by: Justin Ehrenhofer <justin.ehrenhofer@gmail.com>

commit f51f0a1d1f
Merge: 459a40bc d7fa9991
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Jul 13 19:06:22 2023 +0300

    Merge branch 'main' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

commit 459a40bcd9
Merge: e9582f31 7d77a167
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Jul 13 18:59:49 2023 +0300

    Merge remote-tracking branch 'origin/linux/password-direct-input' into linux/password-direct-input

commit e9582f31e5
Merge: fc18b2dc ff420c7c
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Jul 13 18:26:27 2023 +0300

    Merge branch 'main' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

     Conflicts:
    	cw_bitcoin/lib/electrum_transaction_history.dart
    	lib/core/wallet_loading_service.dart
    	lib/di.dart
    	lib/main.dart
    	lib/router.dart
    	lib/src/screens/dashboard/widgets/market_place_page.dart
    	lib/src/screens/wallet_list/wallet_list_page.dart
    	lib/view_model/wallet_list/wallet_list_view_model.dart
    	macos/Podfile.lock
    	res/values/strings_ar.arb
    	res/values/strings_bg.arb
    	res/values/strings_cs.arb
    	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_id.arb
    	res/values/strings_it.arb
    	res/values/strings_ja.arb
    	res/values/strings_ko.arb
    	res/values/strings_my.arb
    	res/values/strings_nl.arb
    	res/values/strings_pl.arb
    	res/values/strings_pt.arb
    	res/values/strings_ru.arb
    	res/values/strings_th.arb
    	res/values/strings_tr.arb
    	res/values/strings_uk.arb
    	res/values/strings_ur.arb
    	res/values/strings_zh.arb

commit 7d77a167ac
Author: Harold Than <62450449+thanvinhbaohoang@users.noreply.github.com>
Date:   Fri Jul 7 07:21:43 2023 -0400

    Button: Cursor to Pointer on Hover (#982)

    * Button: Cursor to Pointer on Hover

    * Updated build-guide-linux.md to Revert Flutter Version

    ---------

    Co-authored-by: Harold <harold@pop-os.localdomain>

commit 1ca09e692d
Author: Serhii <borodenko.sv@gmail.com>
Date:   Thu Jun 29 16:44:31 2023 +0300

    Revert "Merge branch 'linux/password-direct-input' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input"

    This reverts commit 424cf2e635, reversing
    changes made to e1fe03ca28.

commit 02eead0014
Author: Serhii <borodenko.sv@gmail.com>
Date:   Thu Jun 29 16:38:36 2023 +0300

    Revert " fix routing and context issue"

    This reverts commit e1fe03ca28.

commit 424cf2e635
Merge: e1fe03ca fc18b2dc
Author: Serhii <borodenko.sv@gmail.com>
Date:   Thu Jun 29 14:01:18 2023 +0300

    Merge branch 'linux/password-direct-input' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

commit e1fe03ca28
Author: Serhii <borodenko.sv@gmail.com>
Date:   Thu Jun 29 14:00:12 2023 +0300

     fix routing and context issue

commit fc18b2dc52
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Jun 16 22:25:27 2023 +0300

    - Pump Linux version
    - Fix conflicts with main

commit 2da9112aa2
Merge: e592c892 3f2af133
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Jun 16 22:14:52 2023 +0300

    Merge branch 'v4.6.7_v1.3.8' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

     Conflicts:
    	cw_bitcoin/lib/electrum_wallet.dart
    	lib/di.dart
    	lib/main.dart
    	lib/src/screens/dashboard/widgets/market_place_page.dart

commit 3f2af1334d
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Jun 16 21:43:33 2023 +0300

    Pump app versions and update release notes

commit 8ffad4bf80
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Jun 16 19:54:34 2023 +0300

    Revert removing swipe to delete wallet feature

commit 337bfd0527
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Jun 16 17:05:00 2023 +0300

    - Replace payfura widget with direct browser link
    - Remove Payfura widget class as it is duplicate for the web view page

commit e592c892cc
Author: Rafael Saes <76502841+saltrafael@users.noreply.github.com>
Date:   Fri May 26 17:16:36 2023 -0300

    fix: theme refactor for wallet_unlock_page.dart (#951)

commit 76559e50d6
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri May 26 21:52:02 2023 +0300

    Remove secure storage

commit 825c99094f
Merge: 5ba313cb 19cbc40e
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri May 26 21:16:08 2023 +0300

    Merge branch 'main' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

commit 5ba313cb13
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri May 26 16:43:30 2023 +0300

    Fix Conflicts with main

commit 53d3db5340
Merge: 3ddb6c0a 75c65d67
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri May 26 15:09:55 2023 +0300

    Merge branch 'main' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

     Conflicts:
    	cw_core/lib/wallet_base.dart
    	lib/core/auth_service.dart
    	lib/di.dart
    	lib/main.dart
    	lib/router.dart
    	lib/routes.dart
    	lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
    	lib/src/screens/restore/restore_wallet_from_seed_page.dart
    	lib/src/screens/settings/security_backup_page.dart
    	lib/src/screens/wallet_list/wallet_list_page.dart
    	lib/store/settings_store.dart
    	lib/view_model/wallet_creation_vm.dart
    	macos/Podfile.lock
    	pubspec_base.yaml
    	res/values/strings_bg.arb
    	res/values/strings_en.arb
    	res/values/strings_id.arb
    	res/values/strings_my.arb
    	res/values/strings_nl.arb
    	res/values/strings_pt.arb
    	res/values/strings_ru.arb
    	res/values/strings_th.arb
    	res/values/strings_tr.arb
    	res/values/strings_uk.arb
    	res/values/strings_ur.arb
    	res/values/strings_zh.arb

commit 3ddb6c0a40
Author: M <m@cakewallet.com>
Date:   Thu Apr 27 21:17:41 2023 -0400

    Add flatpak section to Linux build guide.

commit 89980cac5a
Author: M <m@cakewallet.com>
Date:   Thu Apr 27 20:51:35 2023 -0400

    Add flatpak manifest. Add desktop file for Linux.

commit 0dc2effe41
Author: M <m@cakewallet.com>
Date:   Tue Apr 25 16:44:14 2023 -0400

    Add check gcc and troubleshooting section to Linux build guide.

commit d4b96d6f98
Author: M <m@cakewallet.com>
Date:   Fri Apr 21 18:08:42 2023 -0400

    Add build guide for Linux.

commit c7138a9124
Author: M <m@cakewallet.com>
Date:   Fri Apr 21 18:06:05 2023 -0400

    Make `model_generator.sh` executable.

commit d45df36238
Author: M <m@cakewallet.com>
Date:   Fri Apr 21 18:02:19 2023 -0400

    Add ability to get random bytes on Linux. Used same method as in cake backups.

commit 5c2490e721
Author: M <m@cakewallet.com>
Date:   Fri Apr 21 15:55:26 2023 -0400

    Update boost version for Linux to 1.82. Update monero for Linux to 0.18.2.2.

commit d251539f13
Author: M <m@cakewallet.com>
Date:   Fri Apr 21 11:48:02 2023 -0400

    Change package_info to package_info_plus

commit a90966b640
Author: M <m@cakewallet.com>
Date:   Wed Apr 19 17:20:04 2023 -0400

    Remove unused constant MONERO_BLOCK_SIZE in ios/Classes/monero_api.cpp

commit d34dca99ed
Author: M <m@cakewallet.com>
Date:   Wed Apr 19 16:11:01 2023 -0400

    Remove duplication for routes. Removed unused constant and fixed TransactionInfoRow iterator for macos/Classes/monero_api.cpp.

commit 2ff6cf43b3
Merge: 2e19e9d2 27961f2f
Author: M <m@cakewallet.com>
Date:   Wed Apr 19 15:18:43 2023 -0400

    Merge branch 'main' of github.com:cake-tech/cake_wallet into linux/password-direct-input

commit 2e19e9d2b6
Author: M <m@cakewallet.com>
Date:   Tue Apr 18 16:45:32 2023 -0400

    Fixes for Linux build scripts. Fixes for load cw_monero on Linux. Catch exception for get PackageInfo in SettingsStore. Add `excludeFlutterSecureStorage` to app_config.sh for Linux. Add FUNCTION_VISABILITY_ATTRIBUTE for monero_api.cpp.

commit 9cd02b7541
Merge: 8efedbcc 786ba3b0
Author: M <m@cakewallet.com>
Date:   Tue Apr 18 15:45:32 2023 -0400

    Merge branch 'desktop-linux' of github.com:cake-tech/cake_wallet into linux/password-direct-input

commit 8efedbccf6
Author: M <m@cakewallet.com>
Date:   Thu Apr 13 19:48:51 2023 -0400

    Add ability to set custom data application directory

commit f52c45b167
Author: M <m@cakewallet.com>
Date:   Mon Apr 10 19:16:13 2023 -0400

    Change encryption method for electrum wallets is wallet password provides directly. Add ability to user for repeat wallets password and compare with original wallet password before wallet creation for cases when wallet password provides directly.

commit 3b82a390c1
Author: M <m@cakewallet.com>
Date:   Thu Mar 30 18:33:59 2023 -0400

    Add ability to enter wallet password directly. Add ability to build without flutter secure storage. Add `excludeFlutterSecureStorage` flag to too/configure.dart for settings for secure storage. Add wallet unlock screen.

commit a70b6f298c
Merge: f0164db4 14a4d413
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Mon Feb 27 15:11:54 2023 +0200

    Merge pull request #804 from cake-tech/desktop-ui-enhancements

    Desktop UI enhancements

commit 14a4d41339
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Sat Feb 25 00:07:15 2023 +0200

    Fixate MobX version to fix restore issue

commit e8fa3953b5
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 17:17:30 2023 +0200

    Fix Navigation animation for settings screens

commit 89aaa9bfef
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 15:49:37 2023 +0200

    Add back wallet settings page to desktop settings actions

commit 26a7bfcee5
Merge: f00dc913 f0164db4
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 15:39:01 2023 +0200

    Merge branch 'dashboard-desktop-view' of https://github.com/cake-tech/cake_wallet into desktop-ui-enhancements

commit f0164db47f
Merge: f050f022 143a6eec
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 15:38:35 2023 +0200

    Merge pull request #802 from cake-tech/CW-321-lock-app-feature-on-mac

    Add app lock feature on mac

commit 143a6eecf5
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 15:38:05 2023 +0200

    pop only PIN screen after successful auth

commit a210a1e325
Merge: 538220f7 f050f022
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 15:23:36 2023 +0200

    Merge branch 'dashboard-desktop-view' of https://github.com/cake-tech/cake_wallet into CW-321-lock-app-feature-on-mac

commit f00dc9132c
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 15:19:59 2023 +0200

    Fix UI issues
    Add missing translation

commit 05b1bb05c4
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 15:18:31 2023 +0200

    Enable adding contact from send screen

commit b7e9237963
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 15:18:01 2023 +0200

    Add Nano currency image

commit 538220f7bc
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Fri Feb 24 14:50:19 2023 +0200

    Add assertion to avoid null

commit 770ed710d7
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Fri Feb 24 14:24:40 2023 +0200

    Add app lock feature on mac

commit f050f022b6
Merge: f8acc1c0 ac099075
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 24 00:40:19 2023 +0200

    Merge branch 'main' of https://github.com/cake-tech/cake_wallet into dashboard-desktop-view

     Conflicts:
    	lib/src/screens/buy/onramper_page.dart
    	lib/src/screens/seed/wallet_seed_page.dart
    	pubspec_base.yaml
    	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

commit f8acc1c007
Merge: 67503f39 d3eb22e1
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 23 21:56:50 2023 +0200

    Merge pull request #791 from cake-tech/fix-desktop-colors-addressbook

    Fix desktop background color and address book view issues

commit d3eb22e1d4
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 23 21:16:28 2023 +0200

    Replace removed code

commit 8d482464d9
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 23 18:56:20 2023 +0200

    Fix ionia input field alignment

commit 67503f393d
Merge: 99344600 016bca01
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 23 18:24:32 2023 +0200

    Merge pull request #797 from cake-tech/align-create-restore-screens

    Fix alignment in create and restore wallet screens

commit 016bca01f4
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 23 18:18:40 2023 +0200

    remove unused code

commit 9934460004
Merge: 7a504abc bba0ce2e
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 23 18:06:27 2023 +0200

    Merge pull request #796 from cake-tech/fix-popup-width-constraints

    Fix Popup width constraint and add focus orders

commit bba0ce2ec6
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 23 18:03:44 2023 +0200

    Remove autofocus

commit 28c599e68a
Merge: d5e9982e 7a504abc
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 23 17:51:26 2023 +0200

    Merge branch 'dashboard-desktop-view' of https://github.com/cake-tech/cake_wallet into align-create-restore-screens

commit d5e9982e91
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 23 16:03:20 2023 +0200

    override navbar with desktopnavbar

commit 7a504abc01
Merge: c05d70b1 9616974d
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 22 19:31:37 2023 +0200

    Merge pull request #787 from cake-tech/macos-fix-settings-create-wallet

    Fix wallet create in settings

commit 9616974d33
Merge: 75d52794 24dc9bea
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 22 19:05:20 2023 +0200

    Merge pull request #790 from cake-tech/add-create-restore-dropdown

    Add create and restore wallet options to dropdown menu

commit 24dc9bea27
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 22 18:47:00 2023 +0200

    remove space

commit 6dc4eafff4
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 22 18:44:49 2023 +0200

    Fix dropdown change state bug

    Hide scanner for desktop

commit c41b6b7f89
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 22 16:17:26 2023 +0200

    Fix alignment in create and restore wallet screens

commit 07f6f43e0b
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Tue Feb 21 22:05:02 2023 +0200

    refactor dropdown items

commit 88e245e480
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Tue Feb 21 12:22:32 2023 +0200

    Fix issues from code review

commit c05d70b118
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Feb 21 01:52:47 2023 +0200

    Fix variable name

commit 44b1eec81d
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Mon Feb 20 23:24:19 2023 +0200

    Fix Popup width constraint and add focus orders

commit 17aa72e460
Merge: 1b892288 c920b62a
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Mon Feb 20 14:48:22 2023 +0200

    Merge pull request #792 from cake-tech/add-keyboard-control

    Add keyboard control for desktop

commit cf125d1e06
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Sat Feb 18 14:23:48 2023 +0200

    Fix issue from code review

commit c920b62aa0
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Sat Feb 18 00:13:51 2023 +0200

    Add onFieldSubmitted to allow "enter" button interaction

commit 59a79242af
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Fri Feb 17 19:06:41 2023 +0200

    Fix input field

commit 52468e1331
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Fri Feb 17 18:19:26 2023 +0200

    Fix desktop background color and address book view issues

commit 4bc81242fc
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Fri Feb 17 16:41:49 2023 +0200

    Add create and restore wallet options to dropdown menu

commit 75d52794f4
Merge: e0970fa1 1b892288
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 16 18:27:19 2023 +0200

    Merge branch 'dashboard-desktop-view' of https://github.com/cake-tech/cake_wallet into macos-fix-settings-create-wallet

commit e0970fa182
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 16 18:05:10 2023 +0200

    fix pageview controller reset index

commit 1b89228893
Merge: bb05573c 4027ea04
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 16 17:57:43 2023 +0200

    Merge pull request #745 from cake-tech/CW-301-desktop-side-bar-ui

    Add desktop sidebar

commit 4027ea04eb
Merge: dd13172c 0015f41a
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 16 17:54:54 2023 +0200

    Merge pull request #775 from cake-tech/CW-311-remove-drawer-from-mac-os

    Replace drawer icon for mac os

commit 0015f41a0d
Merge: 5a77aa20 55bf964a
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 16 17:52:24 2023 +0200

    Merge pull request #785 from cake-tech/desktop-ui-for-exchange-send

    Desktop UI for exchange send

commit 55bf964a27
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 16 17:51:52 2023 +0200

    - Use close icon on main screens
    - Minor UI fixes

commit 5296a2118a
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 15 23:50:15 2023 +0200

    Remove duplicated constrains

commit 2496a6574a
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 15 22:14:07 2023 +0200

    remove unnecessary code

commit f0c4952809
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 15 22:13:24 2023 +0200

    remove unnecessary code

commit 3dcf5b05a5
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 15 22:11:34 2023 +0200

    Fix wallet create in settings

commit 8de9c80fe1
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 15 20:55:06 2023 +0200

    Rename misleading variable
    Change initial mac window size

commit f8d70e7ce6
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 15 16:07:46 2023 +0200

    Fix UI issues, paddings and alignments

commit b1947426fb
Merge: 843db656 5a77aa20
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 15 03:09:38 2023 +0200

    Merge branch 'CW-311-remove-drawer-from-mac-os' of https://github.com/cake-tech/cake_wallet into desktop-ui-for-exchange-send

     Conflicts:
    	lib/src/screens/dashboard/desktop_dashboard_page.dart
    	lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart

commit 843db65603
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 15 01:28:10 2023 +0200

    Add width constraints to desktop dashboard

commit 5a77aa2017
Merge: 107e136f 6caeae28
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 15 01:20:05 2023 +0200

    Merge pull request #786 from cake-tech/CW-312-mac-os-settings-icon-to-be-a-toggle

    MacOS settings icon to be a toggle

commit 6caeae2817
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Tue Feb 14 21:55:13 2023 +0200

    Add padding to support page

commit ea09bba0fb
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Tue Feb 14 21:53:17 2023 +0200

    Make side menu items toggle back to dashboard

commit 02fe3c008f
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Feb 14 18:05:44 2023 +0200

    Constrain primary Buttons width

commit fb5efc0429
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Feb 14 18:01:24 2023 +0200

    Fix Desktop dashboard actions background color

commit 8f76232937
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Feb 14 17:21:09 2023 +0200

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

commit bd04383b7c
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Feb 14 01:36:34 2023 +0200

    Change Exchange page UI depending on platform

commit 10b877f55e
Merge: 107e136f dd13172c
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Sat Feb 11 00:48:16 2023 +0200

    Merge branch 'CW-301-desktop-side-bar-ui' of https://github.com/cake-tech/cake_wallet into CW-311-remove-drawer-from-mac-os

commit dd13172cfe
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Sat Feb 11 00:41:48 2023 +0200

    Add max width constrain to Welcome page

commit 107e136f52
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Sat Feb 11 00:35:11 2023 +0200

    remove empty line

commit bdfe070f8d
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Sat Feb 11 00:32:26 2023 +0200

    Refactor sidebar state management

commit 770e3b6f52
Merge: 99bb3cce 5fa50c76
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 23:29:36 2023 +0200

    Merge pull request #774 from cake-tech/CW-310-add-constraints-to-images-on-macos

    [CW-310] Add constraints to images on macos

commit 5fa50c7668
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 23:27:19 2023 +0200

    Fix Constrained width screens UI

commit c1bf0ee7aa
Merge: eb3b2464 99bb3cce
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 22:54:13 2023 +0200

    Merge branch 'CW-301-desktop-side-bar-ui' of https://github.com/cake-tech/cake_wallet into CW-310-add-constraints-to-images-on-macos

     Conflicts:
    	lib/src/screens/pin_code/pin_code_widget.dart

commit 99bb3cce47
Merge: 2623546b 3fb8be00
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 22:34:18 2023 +0200

    Merge pull request #779 from cake-tech/CW-318-desktop-marketplace

    Add Marketplace to dashboard view

commit 3fb8be0053
Merge: 887afdad 2623546b
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 22:33:31 2023 +0200

    Merge branch 'CW-301-desktop-side-bar-ui' of https://github.com/cake-tech/cake_wallet into CW-318-desktop-marketplace

     Conflicts:
    	lib/src/screens/dashboard/desktop_widgets/desktop_dashboard_actions.dart

commit 2623546b5e
Merge: 2b2bebe9 2ea360d8
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 22:09:55 2023 +0200

    Merge pull request #776 from cake-tech/CW-309-allow-pin-keyboard-entry-on-macos

    Allow Keyboard usage on PIN screen

commit 887afdadd0
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 20:39:23 2023 +0200

    Change ionia welcome page animation

commit 2b2bebe98f
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 20:26:07 2023 +0200

    Refresh desktop dashboard actions on wallet change

commit eb3b246437
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Fri Feb 10 20:19:13 2023 +0200

    Add empty trailing to center page title on desktop

commit 32d2bf2c85
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Fri Feb 10 20:07:53 2023 +0200

    Update widget contraints

commit 89fe8df459
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Fri Feb 10 19:45:48 2023 +0200

    Update trailing icon to open transaction page

commit 6d49e6a543
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 18:40:50 2023 +0200

    Add Marketplace to dashboard view

commit 2ea360d81d
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Feb 10 18:15:05 2023 +0200

    Fix desktop nav bar UI

commit 677305f625
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 9 22:53:02 2023 +0200

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

commit 1831ebf435
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 9 20:29:38 2023 +0200

    Remove drawer from mac os

commit 150d43b2da
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 9 20:11:20 2023 +0200

    constraint images and pincoded box

commit a116241185
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 9 19:17:52 2023 +0200

    Separate Dashboard desktop view from mobile view

commit 5c89c42540
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 9 16:53:07 2023 +0200

    [skip ci] remove .project changes

commit dd2bf60b01
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Thu Feb 9 16:51:49 2023 +0200

    [skip ci] remove .project changes

commit 167eae1293
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 9 16:10:43 2023 +0200

    Revert changes in .gitignore

commit 30d16266c0
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Feb 9 16:02:02 2023 +0200

    Revert removing .lock files

commit 3c17310a5b
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 8 22:12:11 2023 +0200

    [skip ci] reformat desktop dashboard

commit 48ae156eb8
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 8 21:57:26 2023 +0200

    [skip ci] reformat desktop dashboard

commit b1b8193043
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 8 20:41:46 2023 +0200

    Fix issues from code review

commit a1abdc849a
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Feb 8 18:56:00 2023 +0200

    Fix bug on sidebar reset

commit 3f03fb0b18
Merge: 69651b3e 9f69de80
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 8 15:50:37 2023 +0200

    Merge pull request #769 from cake-tech/fix-buy-feature-on-macos

    Fix buy feature on macos

commit 9f69de8057
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 8 15:49:26 2023 +0200

    Remove Podfile.lock from cache

commit 738621254f
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Feb 8 15:46:57 2023 +0200

    Add pubspec.lock and Podfile.lock to gitignore

commit 26b79fe0cd
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Mon Feb 6 18:23:40 2023 +0200

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

commit dea81f92e3
Merge: c7db7b99 69651b3e
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Jan 31 16:48:36 2023 +0200

    Merge remote-tracking branch 'origin/CW-301-desktop-side-bar-ui' into CW-301-desktop-side-bar-ui

commit 69651b3eb4
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Tue Jan 31 15:30:46 2023 +0200

    Remove constants

commit c7db7b99a5
Merge: 9ed77cd6 4902dc8d
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Jan 31 15:23:47 2023 +0200

    Merge remote-tracking branch 'origin/CW-301-desktop-side-bar-ui' into CW-301-desktop-side-bar-ui

commit 4902dc8dd4
Merge: d12bcc80 bb05573c
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Tue Jan 31 15:12:01 2023 +0200

    Merge branch 'dashboard-desktop-view' of https://github.com/cake-tech/cake_wallet into CW-301-desktop-side-bar-ui

commit 9ed77cd6f9
Merge: d12bcc80 bb05573c
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Mon Jan 30 23:43:09 2023 +0200

    Merge branch 'dashboard-desktop-view' of https://github.com/cake-tech/cake_wallet into CW-301-desktop-side-bar-ui

     Conflicts:
    	lib/src/screens/dashboard/dashboard_page.dart

commit bb05573c3a
Merge: de2b887a c20eb232
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Mon Jan 30 23:33:44 2023 +0200

    Merge pull request #753 from cake-tech/mac-os-icons

    Mac os icons

commit d12bcc80d1
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Mon Jan 30 23:32:31 2023 +0200

    Fix exchange page as fullScreenDialog

commit de2b887a9b
Merge: abf5f0b7 adfebe69
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Mon Jan 30 23:31:59 2023 +0200

    Merge branch 'mac-os-fixes' of https://github.com/cake-tech/cake_wallet into dashboard-desktop-view

commit c20eb2325e
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Mon Jan 30 23:28:15 2023 +0200

    Change Mac os app name and bundle id

commit deadc93a76
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Mon Jan 30 23:23:42 2023 +0200

    fix dashboard sidebar and responsive utils

commit abf5f0b7c6
Merge: b6666ca4 5b50ea05
Author: Omar Hatem <omarh.ismail1@gmail.com>
Date:   Mon Jan 30 22:28:24 2023 +0200

    Merge pull request #754 from cake-tech/desktop-appbar-view

    Desktop AppBar

commit 94184d69d6
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Mon Jan 30 17:26:40 2023 +0200

    localize settings

commit d5957b9873
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Mon Jan 30 16:01:37 2023 +0200

    Generate MacOS icons

commit 5b50ea053e
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Sun Jan 29 16:49:42 2023 +0200

    Add Wallet selection dropdown to dashboard desktop view

commit b6666ca405
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Sat Jan 28 17:13:34 2023 +0200

    Ignore increasing brightness for non-mobile platforms

commit 75f33a433e
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Sat Jan 28 12:43:44 2023 +0200

    refactor desktop settings sidebar

commit adfebe6940
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Jan 26 20:53:26 2023 +0200

    Temporarily fetch unstoppable domains only on mobile

commit 132033207e
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Jan 26 02:33:15 2023 +0200

    Remove unstoppable domain from macos since it's not supported

commit 409c13a77a
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Jan 26 02:25:28 2023 +0200

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

commit 90a7432bf9
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Jan 26 02:05:48 2023 +0200

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

commit 6b2bf313a3
Merge: 42a28d42 e8c1d863
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Jan 25 18:24:57 2023 +0200

    Merge branch 'mac-os-fixes' of https://github.com/cake-tech/cake_wallet into dashboard-desktop-view

commit 20ae8d530f
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Jan 25 16:17:50 2023 +0200

    [skip ci] Add desktop sidebar

commit ba09a24d53
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Jan 25 16:14:34 2023 +0200

    [skip ci] Add desktop sidebar

commit 4f1f51e0aa
Author: Godwin Asuquo <godilite@gmail.com>
Date:   Wed Jan 25 15:57:56 2023 +0200

    Add desktop sidebar

commit e8c1d86373
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Jan 25 02:38:28 2023 +0200

    Add platform channel specific code for mac os

commit 4aebbdace7
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Jan 25 00:14:28 2023 +0200

    Revert mac os version

commit fa072ff2f1
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Jan 25 00:11:18 2023 +0200

    Revert mac os version

commit 6e03d2933d
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Jan 25 00:07:11 2023 +0200

    Revert back to Cake fork for secure storage

commit c3c81f7685
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Jan 24 23:58:06 2023 +0200

    Revert back to Cake fork for secure storage

commit d41e7b7bab
Merge: ed0d87c8 ae3620b1
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Jan 20 18:24:39 2023 +0200

    Merge branch 'desktop-mac-os' of https://github.com/cake-tech/cake_wallet into mac-os-fixes

commit ed0d87c893
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Jan 20 17:45:54 2023 +0200

    Update deployment target to 10.13

commit dac7f8e1b3
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Fri Jan 20 15:02:08 2023 +0200

    Add Bundle ID in entitlements files through app config script

commit 786ba3b042
Author: M <m@cakewallet.com>
Date:   Thu Jan 19 18:14:46 2023 -0500

    Add linux application to the project.

commit ae3620b171
Author: M <m@cakewallet.com>
Date:   Thu Jan 19 15:54:59 2023 -0500

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

commit 42a28d4246
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Thu Jan 19 04:04:20 2023 +0200

    Add on Tap to desktop_action_button.dart
    Remove unused functions

commit 42a7439315
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Wed Jan 18 22:11:59 2023 +0200

    Change Dashboard view on desktop size screens

commit 9f1e663719
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Jan 17 22:06:05 2023 +0200

    Add network access to mac

commit 456ba28cb2
Author: OmarHatem <omarh.ismail1@gmail.com>
Date:   Tue Jan 17 21:10:39 2023 +0200

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

commit 31fa9e8b19
Author: M <m@cakewallet.com>
Date:   Tue Jan 10 21:15:24 2023 -0500

    Add build scripts for macOS. Add macos for cw_monero plugin. Add macos proj to the application.
This commit is contained in:
Rafael Saes 2023-09-07 15:40:54 -03:00
parent 0d7fad3610
commit a8e597d5e9
60 changed files with 508 additions and 231 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
assets/text/Monerocom_Release_Notes.txt
View file

@ -1,6 +1,5 @@
Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
Auto generate restore height for Monero restore QR codes
Hausa and Yoruba languages
Additional privacy settings
Update Monero to 0.18.2.2
Refactoring and bug fixes
Ability to Auto generate new Monero subaddress when used
Coin Control for Monero
In-app Live Chat support
Additional themes
Bug Fixes and performance enhancements

12
assets/text/Release_Notes.txt
View file

@ -1,6 +1,6 @@
Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
Auto generate restore height for Monero restore QR codes
Hausa and Yoruba languages
Additional privacy settings
Update Monero to 0.18.2.2
Refactoring and bug fixes
Restore Ethereum from private key and QR
Ability to Auto generate new Monero subaddress when used
Coin Control for Monero
In-app Live Chat support
Additional themes
Bug Fixes and performance enhancements

4
cw_bitcoin/lib/bitcoin_wallet_service.dart
View file

@ -49,7 +49,9 @@ class BitcoinWalletService extends WalletService<
final walletInfo = walletInfoSource.values
.firstWhereOrNull((info) => info.id == WalletBase.idFor(name, getType()))!;
final wallet = await BitcoinWalletBase.open(
password: password, name: name, walletInfo: walletInfo,
password: password,
name: name,
walletInfo: walletInfo,
unspentCoinsInfo: unspentCoinsInfoSource,
encryptionFileUtils: encryptionFileUtilsFor(isDirect));
await wallet.init();

4
cw_bitcoin/lib/litecoin_wallet_service.dart
View file

@ -50,7 +50,9 @@ class LitecoinWalletService extends WalletService<
final walletInfo = walletInfoSource.values
.firstWhereOrNull((info) => info.id == WalletBase.idFor(name, getType()))!;
final wallet = await LitecoinWalletBase.open(
password: password, name: name, walletInfo: walletInfo,
password: password,
name: name,
walletInfo: walletInfo,
unspentCoinsInfo: unspentCoinsInfoSource,
encryptionFileUtils: encryptionFileUtilsFor(isDirect));
await wallet.init();

1
cw_core/lib/wallet_info.dart
View file

@ -1,7 +1,6 @@
import 'dart:async';
import 'package:cw_core/address_info.dart';
import 'package:cw_core/hive_type_ids.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:hive/hive.dart';
import 'package:cw_core/wallet_type.dart';
import 'dart:async';

3
cw_ethereum/lib/ethereum_wallet_service.dart
View file

@ -14,7 +14,7 @@ import 'package:bip39/bip39.dart' as bip39;
import 'package:collection/collection.dart';
class EthereumWalletService extends WalletService<EthereumNewWalletCredentials,
EthereumRestoreWalletFromSeedCredentials, EthereumRestoreWalletFromWIFCredentials> {
EthereumRestoreWalletFromSeedCredentials, EthereumRestoreWalletFromPrivateKey> {
EthereumWalletService(this.walletInfoSource, this.isDirect);
final Box<WalletInfo> walletInfoSource;
@ -75,6 +75,7 @@ class EthereumWalletService extends WalletService<EthereumNewWalletCredentials,
password: credentials.password!,
privateKey: credentials.privateKey,
walletInfo: credentials.walletInfo!,
encryptionFileUtils: encryptionFileUtilsFor(isDirect),
);
await wallet.init();

1
cw_monero/lib/monero_wallet.dart
View file

@ -50,6 +50,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
}),
_isTransactionUpdating = false,
_hasSyncAfterStartup = false,
_password = password,
isEnabledAutoGenerateSubaddress = false,
_password = password,
walletAddresses = MoneroWalletAddresses(walletInfo),

35
ios/Podfile.lock
View file

@ -6,27 +6,8 @@ PODS:
- BigInt (5.2.0)
- connectivity (0.0.1):
- Flutter
- Reachability
- CryptoSwift (1.6.0)
- cw_haven (0.0.1):
- cw_haven/Boost (= 0.0.1)
- cw_haven/Haven (= 0.0.1)
- cw_haven/OpenSSL (= 0.0.1)
- cw_haven/Sodium (= 0.0.1)
- cw_shared_external
- Flutter
- cw_haven/Boost (0.0.1):
- cw_shared_external
- Flutter
- cw_haven/Haven (0.0.1):
- cw_shared_external
- Flutter
- cw_haven/OpenSSL (0.0.1):
- cw_shared_external
- Flutter
- cw_haven/Sodium (0.0.1):
- cw_shared_external
- Flutter
- ReachabilitySwift
- CryptoSwift (1.7.1)
- cw_monero (0.0.2):
- cw_monero/Boost (= 0.0.2)
- cw_monero/Monero (= 0.0.2)
@ -159,7 +140,6 @@ DEPENDENCIES:
- barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
- connectivity (from `.symlinks/plugins/connectivity/ios`)
- CryptoSwift
- cw_haven (from `.symlinks/plugins/cw_haven/ios`)
- cw_monero (from `.symlinks/plugins/cw_monero/ios`)
- cw_shared_external (from `.symlinks/plugins/cw_shared_external/ios`)
- device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
@ -203,10 +183,8 @@ SPEC REPOS:
EXTERNAL SOURCES:
barcode_scan2:
:path: ".symlinks/plugins/barcode_scan2/ios"
connectivity:
:path: ".symlinks/plugins/connectivity/ios"
cw_haven:
:path: ".symlinks/plugins/cw_haven/ios"
connectivity_plus:
:path: ".symlinks/plugins/connectivity_plus/ios"
cw_monero:
:path: ".symlinks/plugins/cw_monero/ios"
cw_shared_external:
@ -259,9 +237,8 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
BigInt: f668a80089607f521586bbe29513d708491ef2f7
connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
CryptoSwift: 562f8eceb40e80796fffc668b0cad9313284cfa6
cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
CryptoSwift: d3d18dc357932f7e6d580689e065cf1f176007c1
cw_monero: 4cf3b96f2da8e95e2ef7d6703dd4d2c509127b7d
cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7

1
ios/Runner.xcodeproj/project.pbxproj
View file

@ -232,6 +232,7 @@
files = (
);
inputPaths = (
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (

42
lib/buy/moonpay/moonpay_buy_provider.dart
View file

@ -17,18 +17,44 @@ class MoonPaySellProvider {
static const _baseTestUrl = 'sell-staging.moonpay.com';
static const _baseProductUrl = 'sell.moonpay.com';
static String get _apiKey => secrets.moonPayApiKey;
static String get _secretKey => secrets.moonPaySecretKey;
static String themeToMoonPayTheme(ThemeBase theme) {
switch (theme.type) {
case ThemeType.bright:
return 'light';
case ThemeType.light:
return 'light';
case ThemeType.dark:
return 'dark';
}
}
static String get _apiKey => secrets.moonPayApiKey;
static String get _secretKey => secrets.moonPaySecretKey;
final bool isTest;
final String baseUrl;
Future<Uri> requestUrl({required CryptoCurrency currency, required String refundWalletAddress}) async {
Future<Uri> requestUrl(
{required CryptoCurrency currency,
required String refundWalletAddress,
required SettingsStore settingsStore}) async {
final customParams = {
'theme': themeToMoonPayTheme(settingsStore.currentTheme),
'language': settingsStore.languageCode,
'colorCode': settingsStore.currentTheme.type == ThemeType.dark
? '#${Palette.blueCraiola.value.toRadixString(16).substring(2, 8)}'
: '#${Palette.moderateSlateBlue.value.toRadixString(16).substring(2, 8)}',
};
final originalUri = Uri.https(
baseUrl, '', <String, dynamic>{
'apiKey': _apiKey,
'defaultBaseCurrencyCode': currency.toString().toLowerCase(),
'refundWalletAddress': refundWalletAddress
});
baseUrl,
'',
<String, dynamic>{
'apiKey': _apiKey,
'defaultBaseCurrencyCode': currency.toString().toLowerCase(),
'refundWalletAddress': refundWalletAddress
}..addAll(customParams));
final messageBytes = utf8.encode('?${originalUri.query}');
final key = utf8.encode(_secretKey);
final hmac = Hmac(sha256, key);

1
lib/core/backup_service.dart
View file

@ -2,6 +2,7 @@ import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';
import 'package:cw_core/root_dir.dart';
import 'package:cake_wallet/entities/cake_2fa_preset_options.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:flutter/foundation.dart';
import 'package:hive/hive.dart';

21
lib/core/wallet_loading_service.dart
View file

@ -7,14 +7,11 @@ import 'package:cw_core/wallet_type.dart';
import 'package:shared_preferences/shared_preferences.dart';
class WalletLoadingService {
WalletLoadingService(
this.sharedPreferences,
this.keyService,
this.walletServiceFactory);
final SharedPreferences sharedPreferences;
final KeyService keyService;
final WalletService Function(WalletType type) walletServiceFactory;
WalletLoadingService(this.sharedPreferences, this.keyService, this.walletServiceFactory);
final SharedPreferences sharedPreferences;
final KeyService keyService;
final WalletService Function(WalletType type) walletServiceFactory;
Future<void> renameWallet(WalletType type, String name, String newName,
{String? password}) async {
@ -38,10 +35,10 @@ class WalletLoadingService {
}
}
Future<WalletBase> load(WalletType type, String name, {String? password}) async {
final walletService = walletServiceFactory.call(type);
final walletPassword = password ?? (await keyService.getWalletPassword(walletName: name));
final wallet = await walletService.openWallet(name, password);
Future<WalletBase> load(WalletType type, String name, {String? password}) async {
final walletService = walletServiceFactory.call(type);
final walletPassword = password ?? (await keyService.getWalletPassword(walletName: name));
final wallet = await walletService.openWallet(name, walletPassword);
if (type == WalletType.monero) {
await updateMoneroWalletPassword(wallet);

6
lib/di.dart
View file

@ -20,6 +20,7 @@ import 'package:cake_wallet/ionia/ionia_tip.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/src/screens/anonpay_details/anonpay_details_page.dart';
import 'package:cake_wallet/src/screens/buy/onramper_page.dart';
import 'package:cake_wallet/src/screens/buy/webview_page.dart';
import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
import 'package:cake_wallet/src/screens/dashboard/widgets/transactions_page.dart';
import 'package:cake_wallet/src/screens/dashboard/desktop_dashboard_page.dart';
@ -874,6 +875,11 @@ Future<void> setup({
getIt.registerFactory(() => SupportPage(getIt.get<SupportViewModel>()));
getIt.registerFactory(() =>
SupportChatPage(getIt.get<SupportViewModel>(), secureStorage: getIt.get<SecureStorage>()));
getIt.registerFactory(() => SupportOtherLinksPage(getIt.get<SupportViewModel>()));
getIt.registerFactory(() {
final wallet = getIt.get<AppStore>().wallet;

5
lib/entities/get_encryption_key.dart
View file

@ -1,9 +1,10 @@
import 'package:cake_wallet/core/secure_storage.dart';
import 'package:cw_core/cake_hive.dart';
import 'package:hive/hive.dart';
Future<List<int>> getEncryptionKey(
{required String forKey, required SecureStorage secureStorage}) async {
final stringifiedKey = await secureStorage.read(key: 'transactionDescriptionsBoxKey');
final stringifiedKey =
await secureStorage.read(key: 'transactionDescriptionsBoxKey');
List<int> key;
if (stringifiedKey == null) {

2
lib/exchange/changenow/changenow_exchange_provider.dart
View file

@ -301,4 +301,4 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
return tag.toLowerCase();
}
}
}
}

2
lib/main.dart
View file

@ -8,8 +8,8 @@ import 'package:cake_wallet/store/yat/yat_store.dart';
import 'package:cake_wallet/utils/exception_handler.dart';
import 'package:cw_core/address_info.dart';
import 'package:cw_core/root_dir.dart';
import 'package:cw_core/root_dir.dart';
import 'package:cake_wallet/utils/responsive_layout_util.dart';
import 'package:cw_core/hive_type_ids.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

2
lib/reactions/check_connection.dart
View file

@ -1,9 +1,9 @@
import 'dart:async';
import 'package:connectivity/connectivity.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/sync_status.dart';
import 'package:cake_wallet/store/settings_store.dart';
import 'package:connectivity/connectivity.dart';
Timer? _checkConnectionTimer;

9
lib/router.dart
View file

@ -471,6 +471,15 @@ Route<dynamic> createRoute(RouteSettings settings) {
fullscreenDialog: true,
builder: (_) => getIt.get<SupportPage>());
case Routes.supportLiveChat:
return CupertinoPageRoute<void>(
builder: (_) => getIt.get<SupportChatPage>());
case Routes.supportOtherLinks:
return CupertinoPageRoute<void>(
fullscreenDialog: true,
builder: (_) => getIt.get<SupportOtherLinksPage>());
case Routes.unspentCoinsList:
return MaterialPageRoute<void>(
builder: (_) => getIt.get<UnspentCoinsListPage>());

1
lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
View file

@ -9,6 +9,7 @@ import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/dropdown_item_
import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
import 'package:cake_wallet/themes/extensions/menu_theme.dart';
import 'package:cake_wallet/themes/extensions/menu_theme.dart';
import 'package:cake_wallet/store/settings_store.dart';
import 'package:cake_wallet/utils/show_bar.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';

104
lib/src/screens/dashboard/widgets/transactions_page.dart
View file

@ -71,70 +71,70 @@ class TransactionsPage extends StatelessWidget {
if (item is TransactionListItem) {
final transaction = item.transaction;
return Observer(
builder: (_) => TransactionRow(
onTap: () => Navigator.of(context)
.pushNamed(Routes.transactionDetails, arguments: transaction),
direction: transaction.direction,
formattedDate: DateFormat('HH:mm').format(transaction.date),
formattedAmount: item.formattedCryptoAmount,
formattedFiatAmount:
dashboardViewModel.balanceViewModel.isFiatDisabled
? ''
: item.formattedFiatAmount,
isPending: transaction.isPending,
title: item.formattedTitle + item.formattedStatus));
}
return Observer(
builder: (_) => TransactionRow(
onTap: () => Navigator.of(context)
.pushNamed(Routes.transactionDetails, arguments: transaction),
direction: transaction.direction,
formattedDate: DateFormat('HH:mm').format(transaction.date),
formattedAmount: item.formattedCryptoAmount,
formattedFiatAmount:
dashboardViewModel.balanceViewModel.isFiatDisabled
? ''
: item.formattedFiatAmount,
isPending: transaction.isPending,
title: item.formattedTitle + item.formattedStatus));
}
if (item is AnonpayTransactionListItem) {
final transactionInfo = item.transaction;
return AnonpayTransactionRow(
onTap: () => Navigator.of(context)
.pushNamed(Routes.anonPayDetailsPage, arguments: transactionInfo),
currency: transactionInfo.fiatAmount != null
? transactionInfo.fiatEquiv ?? ''
: CryptoCurrency.fromFullName(transactionInfo.coinTo)
.name
.toUpperCase(),
provider: transactionInfo.provider,
amount: transactionInfo.fiatAmount?.toString() ??
(transactionInfo.amountTo?.toString() ?? ''),
createdAt: DateFormat('HH:mm').format(transactionInfo.createdAt),
);
}
return AnonpayTransactionRow(
onTap: () => Navigator.of(context)
.pushNamed(Routes.anonPayDetailsPage, arguments: transactionInfo),
currency: transactionInfo.fiatAmount != null
? transactionInfo.fiatEquiv ?? ''
: CryptoCurrency.fromFullName(transactionInfo.coinTo)
.name
.toUpperCase(),
provider: transactionInfo.provider,
amount: transactionInfo.fiatAmount?.toString() ??
(transactionInfo.amountTo?.toString() ?? ''),
createdAt: DateFormat('HH:mm').format(transactionInfo.createdAt),
);
}
if (item is TradeListItem) {
final trade = item.trade;
return Observer(
builder: (_) => TradeRow(
onTap: () => Navigator.of(context)
.pushNamed(Routes.tradeDetails, arguments: trade),
provider: trade.provider,
from: trade.from,
to: trade.to,
createdAtFormattedDate: trade.createdAt != null
? DateFormat('HH:mm').format(trade.createdAt!)
: null,
formattedAmount: item.tradeFormattedAmount));
}
return Observer(
builder: (_) => TradeRow(
onTap: () => Navigator.of(context)
.pushNamed(Routes.tradeDetails, arguments: trade),
provider: trade.provider,
from: trade.from,
to: trade.to,
createdAtFormattedDate: trade.createdAt != null
? DateFormat('HH:mm').format(trade.createdAt!)
: null,
formattedAmount: item.tradeFormattedAmount));
}
if (item is OrderListItem) {
final order = item.order;
return Observer(
builder: (_) => OrderRow(
onTap: () => Navigator.of(context)
.pushNamed(Routes.orderDetails, arguments: order),
provider: order.provider,
from: order.from!,
to: order.to!,
createdAtFormattedDate:
DateFormat('HH:mm').format(order.createdAt),
formattedAmount: item.orderFormattedAmount,
));
}
return Observer(
builder: (_) => OrderRow(
onTap: () => Navigator.of(context)
.pushNamed(Routes.orderDetails, arguments: order),
provider: order.provider,
from: order.from!,
to: order.to!,
createdAtFormattedDate:
DateFormat('HH:mm').format(order.createdAt),
formattedAmount: item.orderFormattedAmount,
));
}
return Container(color: Colors.transparent, height: 1);
})

2
lib/src/screens/new_wallet/new_wallet_page.dart
View file

@ -212,7 +212,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
fontSize: 18.0,
fontWeight: FontWeight.w500,
color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor),
hintText: S.of(context).repeate_wallet_password,
hintText: S.of(context).repeat_wallet_password,
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: Theme.of(context).extension<NewWalletTheme>()!.underlineColor,

6
lib/src/screens/restore/wallet_restore_from_keys_form.dart
View file

@ -23,13 +23,13 @@ class WalletRestoreFromKeysFrom extends StatefulWidget {
final Function(bool) onHeightOrDateEntered;
final WalletRestoreViewModel walletRestoreViewModel;
final bool displayPrivateKeyField;
final bool displayWalletPassword;
final void Function(String)? onPasswordChange;
final void Function(String)? onRepeatedPasswordChange;
@override
WalletRestoreFromKeysFromState createState() =>
WalletRestoreFromKeysFromState(displayWalletPassword: displayWalletPassword);
WalletRestoreFromKeysFromState createState() => WalletRestoreFromKeysFromState(displayWalletPassword: displayWalletPassword);
}
class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
@ -152,7 +152,7 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
padding: EdgeInsets.only(top: 20.0),
child: BaseTextFormField(
controller: repeatedPasswordTextEditingController,
hintText: S.of(context).repeate_wallet_password,
hintText: S.of(context).repeat_wallet_password,
obscureText: true))],
Container(height: 20),
_restoreFromKeysFormFields(),

2
lib/src/screens/restore/wallet_restore_from_seed_form.dart
View file

@ -148,7 +148,7 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
obscureText: true),
BaseTextFormField(
controller: repeatedPasswordTextEditingController,
hintText: S.of(context).repeate_wallet_password,
hintText: S.of(context).repeat_wallet_password,
obscureText: true)],
if (widget.displayLanguageSelector)
GestureDetector(

112
lib/src/screens/settings/display_settings_page.dart
View file

@ -20,60 +20,66 @@ class DisplaySettingsPage extends BasePage {
@override
Widget body(BuildContext context) {
return Observer(builder: (_) {
return Container(
padding: EdgeInsets.only(top: 10),
child: Column(
children: [
SettingsSwitcherCell(
title: S.current.settings_display_balance,
value: _displaySettingsViewModel.shouldDisplayBalance,
onValueChange: (_, bool value) {
_displaySettingsViewModel.setShouldDisplayBalance(value);
}),
SettingsSwitcherCell(
title: S.current.show_market_place,
value: _displaySettingsViewModel.shouldShowMarketPlaceInDashboard,
onValueChange: (_, bool value) {
_displaySettingsViewModel.setShouldShowMarketPlaceInDashbaord(value);
},
),
//if (!isHaven) it does not work correctly
if(!_displaySettingsViewModel.disabledFiatApiMode)
SettingsPickerCell<FiatCurrency>(
title: S.current.settings_currency,
searchHintText: S.current.search_currency,
items: FiatCurrency.all,
selectedItem: _displaySettingsViewModel.fiatCurrency,
onItemSelected: (FiatCurrency currency) => _displaySettingsViewModel.setFiatCurrency(currency),
images: FiatCurrency.all.map((e) => Image.asset("assets/images/flags/${e.countryCode}.png")).toList(),
isGridView: true,
matchingCriteria: (FiatCurrency currency, String searchText) {
return currency.title.toLowerCase().contains(searchText) ||
currency.fullName.toLowerCase().contains(searchText);
return SingleChildScrollView(
child: Observer(builder: (_) {
return Container(
padding: EdgeInsets.only(top: 10),
child: Column(
children: [
SettingsSwitcherCell(
title: S.current.settings_display_balance,
value: _displaySettingsViewModel.shouldDisplayBalance,
onValueChange: (_, bool value) {
_displaySettingsViewModel.setShouldDisplayBalance(value);
}),
SettingsSwitcherCell(
title: S.current.show_market_place,
value: _displaySettingsViewModel.shouldShowMarketPlaceInDashboard,
onValueChange: (_, bool value) {
_displaySettingsViewModel.setShouldShowMarketPlaceInDashbaord(value);
},
),
SettingsPickerCell<String>(
title: S.current.settings_change_language,
searchHintText: S.current.search_language,
items: LanguageService.list.keys.toList(),
displayItem: (dynamic code) {
return LanguageService.list[code] ?? '';
},
selectedItem: _displaySettingsViewModel.languageCode,
onItemSelected: _displaySettingsViewModel.onLanguageSelected,
images: LanguageService.list.keys
.map((e) => Image.asset("assets/images/flags/${LanguageService.localeCountryCode[e]}.png"))
.toList(),
matchingCriteria: (String code, String searchText) {
return LanguageService.list[code]?.toLowerCase().contains(searchText) ?? false;
},
),
if (ResponsiveLayoutUtil.instance.isMobile && DeviceInfo.instance.isMobile)
SettingsThemeChoicesCell(_displaySettingsViewModel),
],
),
);
});
//if (!isHaven) it does not work correctly
if (!_displaySettingsViewModel.disabledFiatApiMode)
SettingsPickerCell<FiatCurrency>(
title: S.current.settings_currency,
searchHintText: S.current.search_currency,
items: FiatCurrency.all,
selectedItem: _displaySettingsViewModel.fiatCurrency,
onItemSelected: (FiatCurrency currency) =>
_displaySettingsViewModel.setFiatCurrency(currency),
images: FiatCurrency.all
.map((e) => Image.asset("assets/images/flags/${e.countryCode}.png"))
.toList(),
isGridView: true,
matchingCriteria: (FiatCurrency currency, String searchText) {
return currency.title.toLowerCase().contains(searchText) ||
currency.fullName.toLowerCase().contains(searchText);
},
),
SettingsPickerCell<String>(
title: S.current.settings_change_language,
searchHintText: S.current.search_language,
items: LanguageService.list.keys.toList(),
displayItem: (dynamic code) {
return LanguageService.list[code] ?? '';
},
selectedItem: _displaySettingsViewModel.languageCode,
onItemSelected: _displaySettingsViewModel.onLanguageSelected,
images: LanguageService.list.keys
.map((e) => Image.asset(
"assets/images/flags/${LanguageService.localeCountryCode[e]}.png"))
.toList(),
matchingCriteria: (String code, String searchText) {
return LanguageService.list[code]?.toLowerCase().contains(searchText) ?? false;
},
),
if (ResponsiveLayoutUtil.instance.isMobile && DeviceInfo.instance.isMobile)
SettingsThemeChoicesCell(_displaySettingsViewModel),
],
),
);
}),
);
}
}

3
lib/src/screens/support/widgets/support_tiles.dart
View file

@ -1,3 +1,4 @@
import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
import 'package:flutter/material.dart';
@ -44,7 +45,7 @@ class SupportTile extends StatelessWidget {
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
color: Theme.of(context).dialogTheme.backgroundColor,
color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
),
),
Padding(

38
lib/src/screens/support_chat/support_chat_page.dart Normal file
View file

@ -0,0 +1,38 @@
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/src/screens/support_chat/widgets/chatwoot_widget.dart';
import 'package:cake_wallet/view_model/support_view_model.dart';
import 'package:flutter/material.dart';
import 'package:cake_wallet/core/secure_storage.dart';
class SupportChatPage extends BasePage {
SupportChatPage(this.supportViewModel, {required this.secureStorage});
final SupportViewModel supportViewModel;
final SecureStorage secureStorage;
@override
String get title => S.current.settings_support;
@override
AppBarStyle get appBarStyle => AppBarStyle.regular;
@override
Widget body(BuildContext context) => FutureBuilder<String>(
future: getCookie(),
builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
print(snapshot.data);
if (snapshot.hasData)
return ChatwootWidget(
secureStorage,
supportUrl: supportViewModel.fetchUrl(authToken: snapshot.data!)
);
return Container();
},
);
Future<String> getCookie() async {
return await secureStorage.read(key: COOKIE_KEY) ?? "";
}
}

62
lib/src/screens/support_chat/widgets/chatwoot_widget.dart Normal file
View file

@ -0,0 +1,62 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:cake_wallet/core/secure_storage.dart';
const COOKIE_KEY = 'chatwootCookie';
class ChatwootWidget extends StatefulWidget {
ChatwootWidget(this.secureStorage, {required this.supportUrl});
final SecureStorage secureStorage;
final String supportUrl;
@override
ChatwootWidgetState createState() => ChatwootWidgetState();
}
class ChatwootWidgetState extends State<ChatwootWidget> {
final GlobalKey _webViewkey = GlobalKey();
@override
Widget build(BuildContext context) => InAppWebView(
key: _webViewkey,
initialOptions: InAppWebViewGroupOptions(
crossPlatform: InAppWebViewOptions(transparentBackground: true),
),
initialUrlRequest: URLRequest(url: Uri.tryParse(widget.supportUrl)),
onWebViewCreated: (InAppWebViewController controller) {
controller.addWebMessageListener(
WebMessageListener(
jsObjectName: 'ReactNativeWebView',
onPostMessage: (String? message, Uri? sourceOrigin, bool isMainFrame,
JavaScriptReplyProxy replyProxy) {
final shortenedMessage = message?.substring(16);
if (shortenedMessage != null && isJsonString(shortenedMessage)) {
final parsedMessage = jsonDecode(shortenedMessage);
final eventType = parsedMessage["event"];
if (eventType == 'loaded') {
final authToken = parsedMessage["config"]["authToken"];
print(authToken);
storeCookie(authToken as String);
}
}
},
),
);
},
);
bool isJsonString(String str) {
try {
jsonDecode(str);
} catch (e) {
return false;
}
return true;
}
Future<void> storeCookie(String value) async =>
await widget.secureStorage.write(key: COOKIE_KEY, value: value);
}

2
lib/src/widgets/search_bar_widget.dart
View file

@ -17,7 +17,7 @@ class SearchBarWidget extends StatelessWidget {
Widget build(BuildContext context) {
return TextFormField(
controller: searchController,
style: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchTextColor),
style: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
decoration: InputDecoration(
hintText: hintText ?? S.of(context).search_currency,
hintStyle: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),

1
lib/store/settings_store.dart
View file

@ -346,6 +346,7 @@ abstract class SettingsStoreBase with Store {
static const defaultPinLength = 4;
static const defaultActionsMode = 11;
static const defaultPinCodeTimeOutDuration = PinCodeRequiredDuration.tenminutes;
static final walletPasswordDirectInput = Platform.isLinux;
static const defaultAutoGenerateSubaddressStatus = AutoGenerateSubaddressStatus.initialized;
static final walletPasswordDirectInput = Platform.isLinux;

2
lib/view_model/unspent_coins/unspent_coins_list_view_model.dart
View file

@ -3,11 +3,9 @@ import 'package:cake_wallet/bitcoin/bitcoin.dart';
import 'package:cake_wallet/entities/unspent_transaction_output.dart';
import 'package:cake_wallet/monero/monero.dart';
import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_item.dart';
import 'package:cw_bitcoin/bitcoin_wallet.dart';
import 'package:cw_core/unspent_coins_info.dart';
import 'package:cw_core/wallet_base.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:cw_monero/monero_wallet.dart';
import 'package:hive/hive.dart';
import 'package:mobx/mobx.dart';

12
model_generator.sh
View file

@ -1,8 +1,8 @@
#!/bin/sh
cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
cd cw_ethereum && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
flutter packages pub run build_runner build --delete-conflicting-outputs
cd cw_core; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
cd cw_monero; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
cd cw_bitcoin; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
cd cw_haven; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
cd cw_ethereum; flutter pub get; flutter packages pub run build_runner build --delete-conflicting-outputs; cd ..
dart run build_runner build --delete-conflicting-outputs

11
res/values/strings_ar.arb
View file

@ -697,8 +697,11 @@
"select_destination": ".ﻲﻃﺎﻴﺘﺣﻻﺍ ﺦﺴﻨﻟﺍ ﻒﻠﻣ ﺔﻬﺟﻭ ﺪﻳﺪﺤﺗ ءﺎﺟﺮﻟﺍ",
"save_to_downloads": "ﺕﻼﻳﺰﻨﺘﻟﺍ ﻲﻓ ﻆﻔﺣ",
"support_description_other_links": "انضم إلى مجتمعاتنا أو تصل إلينا شركائنا من خلال أساليب أخرى",
"auto_generate_subaddresses": "تلقائي توليد subddresses"
=======
"template_name": "اسم القالب"
>>>>>>> cw-linux-squash-3
"auto_generate_subaddresses": "تلقائي توليد subddresses",
"invalid_password": "رمز مرور خاطئ",
"unlock": "الغاء القفل",
"enter_wallet_password": "أدخل كلمة مرور المحفظة",
"repeat_wallet_password": "كرر كلمة مرور المحفظة",
"wallet_password_is_empty": "كلمة مرور المحفظة فارغة. يجب ألا تكون كلمة مرور المحفظة فارغة",
"repeated_password_is_incorrect": "كلمة المرور المتكررة غير صحيحة. يرجى تكرار كلمة مرور المحفظة مرة أخرى."
}

9
res/values/strings_bg.arb
View file

@ -692,5 +692,12 @@
"support_title_other_links": "Други връзки за поддръжка",
"support_description_other_links": "Присъединете се към нашите общности или се свържете с нас нашите партньори чрез други методи",
"select_destination": "Моля, изберете дестинация за архивния файл.",
"save_to_downloads": "Запазване в Изтегляния"
"save_to_downloads": "Запазване в Изтегляния",
"settings": "Настройки",
"invalid_password": "Невалидна парола",
"unlock": "Отключване",
"enter_wallet_password": "Въведете паролата за портфейла",
"repeat_wallet_password": "Повторете паролата на портфейла",
"wallet_password_is_empty": "Паролата за портфейл е празна. Паролата за портфейл не трябва да е празна",
"repeated_password_is_incorrect": "Многократната парола е неправилна. Моля, повторете отново паролата за портфейла."
}

8
res/values/strings_cs.arb
View file

@ -685,5 +685,11 @@
"support_title_other_links": "Další odkazy na podporu",
"support_description_other_links": "Připojte se k našim komunitám nebo se k nám oslovte další metody",
"select_destination": "Vyberte cíl pro záložní soubor.",
"save_to_downloads": "Uložit do Stažených souborů"
"save_to_downloads": "Uložit do Stažených souborů",
"invalid_password": "Neplatné heslo",
"unlock": "Odemknout",
"enter_wallet_password": "Zadejte heslo peněženky",
"repeat_wallet_password": "Opakujte heslo peněženky",
"wallet_password_is_empty": "Heslo peněženky je prázdné. Heslo peněženky by nemělo být prázdné",
"repeated_password_is_incorrect": "Opakované heslo je nesprávné. Znovu opakujte heslo peněženky."
}

10
res/values/strings_de.arb
View file

@ -647,7 +647,7 @@
"matrix_green_dark_theme": "Matrix Green Dark Theme",
"monero_light_theme": "Monero Light-Thema",
"auto_generate_subaddresses": "Unteradressen automatisch generieren",
"cake_2fa_preset" : "Cake 2FA-Voreinstellung",
"cake_2fa_preset": "Cake 2FA-Voreinstellung",
"narrow": "Eng",
"normal": "Normal",
"aggressive": "Übereifrig",
@ -693,5 +693,11 @@
"support_title_other_links": "Andere Support-Links",
"support_description_other_links": "Treten Sie unseren Communities bei oder erreichen Sie uns oder unsere Partner über andere Methoden",
"select_destination": "Bitte wählen Sie das Ziel für die Sicherungsdatei aus.",
"save_to_downloads": "Unter „Downloads“ speichern"
"save_to_downloads": "Unter „Downloads“ speichern",
"invalid_password": "Ungültiges Passwort",
"unlock": "Freischalten",
"enter_wallet_password": "Geben Sie das Brieftaschenkennwort ein",
"repeat_wallet_password": "Wiederholen Sie das Brieftaschenkennwort",
"wallet_password_is_empty": "Brieftaschenkennwort ist leer. Brieftaschenkennwort sollte nicht leer sein",
"repeated_password_is_incorrect": "Wiederholtes Passwort ist falsch. Bitte wiederholen Sie das Brieftaschenkennwort erneut."
}

8
res/values/strings_en.arb
View file

@ -693,5 +693,11 @@
"support_title_other_links": "Other support links",
"support_description_other_links": "Join our communities or reach us our our partners through other methods",
"select_destination": "Please select destination for the backup file.",
"save_to_downloads": "Save to Downloads"
"save_to_downloads": "Save to Downloads",
"invalid_password": "Invalid password",
"unlock": "Unlock",
"enter_wallet_password": "Enter the wallet password",
"repeat_wallet_password": "Repeat the wallet password",
"wallet_password_is_empty": "Wallet password is empty. Wallet password should not be empty",
"repeated_password_is_incorrect": "Repeated password is incorrect. Please repeat the wallet password again."
}

8
res/values/strings_es.arb
View file

@ -693,5 +693,11 @@
"support_title_other_links": "Otros enlaces de soporte",
"support_description_other_links": "Únase a nuestras comunidades o comuníquese con nosotros nuestros socios a través de otros métodos",
"select_destination": "Seleccione el destino del archivo de copia de seguridad.",
"save_to_downloads": "Guardar en Descargas"
"save_to_downloads": "Guardar en Descargas",
"invalid_password": "Contraseña invalida",
"unlock": "desbloquear",
"enter_wallet_password": "Ingrese la contraseña de la billetera",
"repeat_wallet_password": "Repita la contraseña de billetera",
"wallet_password_is_empty": "La contraseña de billetera está vacía. La contraseña de la billetera no debe estar vacía",
"repeated_password_is_incorrect": "La contraseña repetida es incorrecta. Repita la contraseña de la billetera nuevamente."
}

8
res/values/strings_fr.arb
View file

@ -693,5 +693,11 @@
"support_title_other_links": "Autres liens d'assistance",
"support_description_other_links": "Rejoignez nos communautés ou contactez-nous nos partenaires à travers d'autres méthodes",
"select_destination": "Veuillez sélectionner la destination du fichier de sauvegarde.",
"save_to_downloads": "Enregistrer dans les téléchargements"
"save_to_downloads": "Enregistrer dans les téléchargements",
"invalid_password": "Mot de passe incorrect",
"unlock": "Ouvrir",
"enter_wallet_password": "Entrez le mot de passe du portefeuille",
"repeat_wallet_password": "Répétez le mot de passe du portefeuille",
"wallet_password_is_empty": "Le mot de passe du portefeuille est vide. Le mot de passe du portefeuille ne doit pas être vide",
"repeated_password_is_incorrect": "Le mot de passe répété est incorrect. Veuillez répéter le mot de passe du portefeuille."
}

8
res/values/strings_ha.arb
View file

@ -671,5 +671,11 @@
"support_title_other_links": "Sauran hanyoyin tallafi",
"support_description_other_links": "Kasance tare da al'ummominmu ko kuma ka kai mu abokanmu ta hanyar wasu hanyoyi",
"select_destination": "Da fatan za a zaɓi wurin da za a yi wa madadin fayil ɗin.",
"save_to_downloads": "Ajiye zuwa Zazzagewa"
"save_to_downloads": "Ajiye zuwa Zazzagewa",
"invalid_password": "Kalmar sirri mara inganci",
"unlock": "Buɗe",
"enter_wallet_password": "Shigar da kalmar sirri ta walat",
"repeat_wallet_password": "Maimaita kalmar sirri",
"wallet_password_is_empty": "Alamar Wallet babu komai. Al'adun Wallet bai zama komai ba",
"repeated_password_is_incorrect": "Maimaita kalmar sirri ba daidai ba ce. Da fatan za a sake maimaita kalmar sirri."
}

8
res/values/strings_hi.arb
View file

@ -693,5 +693,11 @@
"support_title_other_links": "अन्य समर्थन लिंक",
"support_description_other_links": "हमारे समुदायों में शामिल हों या अन्य तरीकों के माध्यम से हमारे साथी तक पहुंचें",
"select_destination": "कृपया बैकअप फ़ाइल के लिए गंतव्य का चयन करें।",
"save_to_downloads": "डाउनलोड में सहेजें"
"save_to_downloads": "डाउनलोड में सहेजें",
"invalid_password": "अवैध पासवर्ड",
"unlock": "अनलॉक",
"enter_wallet_password": "वॉलेट पासवर्ड दर्ज करें",
"repeat_wallet_password": "वॉलेट पासवर्ड दोहराएं",
"wallet_password_is_empty": "वॉलेट पासवर्ड खाली है। वॉलेट पासवर्ड खाली नहीं होना चाहिए",
"repeated_password_is_incorrect": "बार -बार पासवर्ड गलत है। कृपया फिर से वॉलेट पासवर्ड दोहराएं।"
}

8
res/values/strings_hr.arb
View file

@ -693,5 +693,11 @@
"support_title_other_links": "Ostale veze za podršku",
"support_description_other_links": "Pridružite se našim zajednicama ili nam dosegnu naše partnere drugim metodama",
"select_destination": "Odaberite odredište za datoteku sigurnosne kopije.",
"save_to_downloads": "Spremi u Preuzimanja"
"save_to_downloads": "Spremi u Preuzimanja",
"invalid_password": "Netočna zaporka",
"unlock": "Otključati",
"enter_wallet_password": "Unesite lozinku za novčanik",
"repeat_wallet_password": "Ponovite lozinku za novčanik",
"wallet_password_is_empty": "Lozinka za novčanik je prazna. Lozinka za novčanik ne bi trebala biti prazna",
"repeated_password_is_incorrect": "Ponovljena lozinka je netočna. Molimo ponovite lozinku za novčanik."
}

8
res/values/strings_id.arb
View file

@ -682,5 +682,11 @@
"support_title_other_links": "Tautan dukungan lainnya",
"support_description_other_links": "Bergabunglah dengan komunitas kami atau hubungi kami mitra kami melalui metode lain",
"select_destination": "Silakan pilih tujuan untuk file cadangan.",
"save_to_downloads": "Simpan ke Unduhan"
"save_to_downloads": "Simpan ke Unduhan",
"invalid_password": "Kata sandi salah",
"unlock": "Membuka kunci",
"enter_wallet_password": "Masukkan Kata Sandi Dompet",
"repeat_wallet_password": "Ulangi Kata Sandi Dompet",
"wallet_password_is_empty": "Kata sandi dompet kosong. Kata sandi dompet tidak boleh kosong",
"repeated_password_is_incorrect": "Kata sandi yang diulang tidak benar. Harap ulangi kata sandi dompet lagi."
}

8
res/values/strings_it.arb
View file

@ -693,5 +693,11 @@
"support_title_other_links": "Altri collegamenti di supporto",
"support_description_other_links": "Unisciti alle nostre comunità o raggiungici i nostri partner attraverso altri metodi",
"select_destination": "Seleziona la destinazione per il file di backup.",
"save_to_downloads": "Salva in Download"
"save_to_downloads": "Salva in Download",
"invalid_password": "Password non valida",
"unlock": "Sbloccare",
"enter_wallet_password": "Immettere la password del portafoglio",
"repeat_wallet_password": "Ripeti la password del portafoglio",
"wallet_password_is_empty": "La password del portafoglio è vuota. La password del portafoglio non dovrebbe essere vuota",
"repeated_password_is_incorrect": "La password ripetuta non è corretta. Si prega di ripetere di nuovo la password del portafoglio."
}

8
res/values/strings_ja.arb
View file

@ -693,5 +693,11 @@
"support_description_other_links": "私たちのコミュニティに参加するか、他の方法を通して私たちのパートナーに連絡してください",
"select_destination": "バックアップファイルの保存先を選択してください。",
"save_to_downloads": "ダウンロードに保存",
"auto_generate_subaddresses": "Autoはサブアドレスを生成します"
"auto_generate_subaddresses": "Autoはサブアドレスを生成します",
"invalid_password": "無効なパスワード",
"unlock": "ロックを解除します",
"enter_wallet_password": "ウォレットパスワードを入力します",
"repeat_wallet_password": "ウォレットパスワードを繰り返します",
"wallet_password_is_empty": "ウォレットパスワードは空です。ウォレットのパスワードは空にしてはいけません",
"repeated_password_is_incorrect": "繰り返しパスワードが正しくありません。ウォレットのパスワードをもう一度繰り返してください。"
}

8
res/values/strings_ko.arb
View file

@ -693,5 +693,11 @@
"support_description_other_links": "다른 방법을 통해 커뮤니티에 가입하거나 파트너에게 연락하십시오.",
"select_destination": "백업 파일의 대상을 선택하십시오.",
"save_to_downloads": "다운로드에 저장",
"auto_generate_subaddresses": "자동 생성 서브 아드 드레스"
"auto_generate_subaddresses": "자동 생성 서브 아드 드레스",
"invalid_password": "유효하지 않은 비밀번호",
"unlock": "터놓다",
"enter_wallet_password": "지갑 암호를 입력하십시오",
"repeat_wallet_password": "지갑 암호를 반복하십시오",
"wallet_password_is_empty": "지갑 암호는 비어 있습니다. 지갑 암호는 비어 있지 않아야합니다",
"repeated_password_is_incorrect": "반복 된 비밀번호가 올바르지 않습니다. 지갑 암호를 다시 반복하십시오."
}

8
res/values/strings_my.arb
View file

@ -691,5 +691,11 @@
"support_description_other_links": "ကျွန်ုပ်တို့၏လူမှုအသိုင်းအဝိုင်းများသို့ 0 င်ရောက်ပါ",
"select_destination": "အရန်ဖိုင်အတွက် ဦးတည်ရာကို ရွေးပါ။",
"save_to_downloads": "ဒေါင်းလုဒ်များထံ သိမ်းဆည်းပါ။",
"auto_generate_subaddresses": "အော်တို Generate Subaddresses"
"auto_generate_subaddresses": "အော်တို Generate Subaddresses",
"invalid_password": "မမှန်ကန်သောစကားဝှက်",
"unlock": "သော့ဖွင့်",
"enter_wallet_password": "ပိုက်ဆံအိတ်စကားဝှက်ကိုရိုက်ထည့်ပါ",
"repeat_wallet_password": "ပိုက်ဆံအိတ်စကားဝှက်ကိုပြန်လုပ်ပါ",
"wallet_password_is_empty": "ပိုက်ဆံအိတ်စကားဝှက်သည်ဗလာဖြစ်သည်။ ပိုက်ဆံအိတ်စကားဝှက်သည်အချည်းနှီးဖြစ်သင့်သည်",
"repeated_password_is_incorrect": "ထပ်ခါတလဲလဲစကားဝှက်မမှန်ကန်ပါ ကျေးဇူးပြုပြီးပိုက်ဆံအိတ်စကားဝှက်ကိုပြန်လုပ်ပါ။"
}

8
res/values/strings_nl.arb
View file

@ -693,5 +693,11 @@
"support_title_other_links": "Andere ondersteuningslinks",
"support_description_other_links": "Word lid van onze gemeenschappen of bereik ons ​​onze partners via andere methoden",
"select_destination": "Selecteer de bestemming voor het back-upbestand.",
"save_to_downloads": "Opslaan in downloads"
"save_to_downloads": "Opslaan in downloads",
"invalid_password": "Ongeldig wachtwoord",
"unlock": "Ontgrendelen",
"enter_wallet_password": "Voer het Wallet -wachtwoord in",
"repeat_wallet_password": "Herhaal het Wallet -wachtwoord",
"wallet_password_is_empty": "Wallet -wachtwoord is leeg. Wallet -wachtwoord mag niet leeg zijn",
"repeated_password_is_incorrect": "Herhaald wachtwoord is onjuist. Herhaal het Wallet -wachtwoord opnieuw."
}

8
res/values/strings_pl.arb
View file

@ -693,5 +693,11 @@
"support_title_other_links": "Inne linki wsparcia",
"support_description_other_links": "Dołącz do naszych społeczności lub skontaktuj się z nami naszymi partnerami za pomocą innych metod",
"select_destination": "Wybierz miejsce docelowe dla pliku kopii zapasowej.",
"save_to_downloads": "Zapisz w Pobranych"
"save_to_downloads": "Zapisz w Pobranych",
"invalid_password": "Nieprawidłowe hasło",
"unlock": "Odblokować",
"enter_wallet_password": "Wprowadź hasło portfela",
"repeat_wallet_password": "Powtórz hasło portfela",
"wallet_password_is_empty": "Hasło portfela jest puste. Hasło portfela nie powinno być puste",
"repeated_password_is_incorrect": "Powtarzane hasło jest nieprawidłowe. Powtórz ponownie hasło portfela."
}

8
res/values/strings_pt.arb
View file

@ -692,5 +692,11 @@
"support_title_other_links": "Outros links de suporte",
"support_description_other_links": "Junte -se às nossas comunidades ou chegue a nós nossos parceiros por meio de outros métodos",
"select_destination": "Selecione o destino para o arquivo de backup.",
"save_to_downloads": "Salvar em Downloads"
"save_to_downloads": "Salvar em Downloads",
"invalid_password": "Senha inválida",
"unlock": "Desbloquear",
"enter_wallet_password": "Digite a senha da carteira",
"repeat_wallet_password": "Repita a senha da carteira",
"wallet_password_is_empty": "A senha da carteira está vazia. A senha da carteira não deve estar vazia",
"repeated_password_is_incorrect": "A senha repetida está incorreta. Repita a senha da carteira novamente."
}

8
res/values/strings_ru.arb
View file

@ -694,5 +694,11 @@
"support_description_other_links": "Присоединяйтесь к нашим сообществам или охватите нас наших партнеров с помощью других методов",
"select_destination": "Пожалуйста, выберите место для файла резервной копии.",
"save_to_downloads": "Сохранить в загрузках",
"auto_generate_subaddresses": "Авто генерируйте Subaddresses"
"auto_generate_subaddresses": "Авто генерируйте Subaddresses",
"invalid_password": "Неверный пароль",
"unlock": "Разблокировать",
"enter_wallet_password": "Введите пароль кошелька",
"repeat_wallet_password": "Повторите пароль кошелька",
"wallet_password_is_empty": "Пароль кошелька пуст. Пароль кошелька не должен быть пустым",
"repeated_password_is_incorrect": "Повторный пароль неверен. Пожалуйста, повторите пароль кошелька снова."
}

8
res/values/strings_th.arb
View file

@ -691,5 +691,11 @@
"support_description_other_links": "เข้าร่วมชุมชนของเราหรือเข้าถึงเราพันธมิตรของเราผ่านวิธีการอื่น ๆ",
"select_destination": "โปรดเลือกปลายทางสำหรับไฟล์สำรอง",
"save_to_downloads": "บันทึกลงดาวน์โหลด",
"auto_generate_subaddresses": "Auto สร้าง subaddresses"
"auto_generate_subaddresses": "Auto สร้าง subaddresses",
"invalid_password": "รหัสผ่านไม่ถูกต้อง",
"unlock": "ปลดล็อค",
"enter_wallet_password": "ป้อนรหัสผ่านกระเป๋าเงิน",
"repeat_wallet_password": "ทำซ้ำรหัสผ่านกระเป๋าเงิน",
"wallet_password_is_empty": "รหัสผ่านกระเป๋าเงินว่างเปล่า รหัสผ่านกระเป๋าเงินไม่ควรว่างเปล่า",
"repeated_password_is_incorrect": "รหัสผ่านซ้ำไม่ถูกต้อง โปรดทำซ้ำรหัสผ่านกระเป๋าเงินอีกครั้ง"
}

8
res/values/strings_tr.arb
View file

@ -691,5 +691,11 @@
"support_title_other_links": "Diğer destek bağlantıları",
"support_description_other_links": "Topluluklarımıza katılın veya ortaklarımıza diğer yöntemlerle bize ulaşın",
"select_destination": "Lütfen yedekleme dosyası için hedef seçin.",
"save_to_downloads": "İndirilenlere Kaydet"
"save_to_downloads": "İndirilenlere Kaydet",
"invalid_password": "Geçersiz şifre",
"unlock": "Kilidini aç",
"enter_wallet_password": "Cüzdan şifresini girin",
"repeat_wallet_password": "Cüzdan şifresini tekrarlayın",
"wallet_password_is_empty": "Cüzdan şifresi boş. Cüzdan şifresi boş olmamalı",
"repeated_password_is_incorrect": "Tekrarlanan şifre yanlış. Lütfen cüzdan şifresini tekrarlayın."
}

8
res/values/strings_uk.arb
View file

@ -693,5 +693,11 @@
"support_title_other_links": "Інші посилання на підтримку",
"support_description_other_links": "Приєднуйтесь до наших спільнот або досягайте нас нашими партнерами іншими методами",
"select_destination": "Виберіть місце призначення для файлу резервної копії.",
"save_to_downloads": "Зберегти до завантажень"
"save_to_downloads": "Зберегти до завантажень",
"invalid_password": "Недійсний пароль",
"unlock": "Розблокувати",
"enter_wallet_password": "Введіть пароль гаманця",
"repeat_wallet_password": "Повторіть пароль гаманця",
"wallet_password_is_empty": "Пароль гаманця порожній. Пароль гаманця не повинен бути порожнім",
"repeated_password_is_incorrect": "Повторний пароль невірний. Будь ласка, повторіть пароль гаманця ще раз."
}

8
res/values/strings_ur.arb
View file

@ -686,5 +686,11 @@
"support_description_other_links": "ہماری برادریوں میں شامل ہوں یا دوسرے طریقوں سے ہمارے شراکت داروں تک پہنچیں",
"select_destination": "۔ﮟﯾﺮﮐ ﺏﺎﺨﺘﻧﺍ ﺎﮐ ﻝﺰﻨﻣ ﮯﯿﻟ ﮯﮐ ﻞﺋﺎﻓ ﭖﺍ ﮏﯿﺑ ﻡﺮﮐ ﮦﺍﺮﺑ",
"save_to_downloads": "۔ﮟﯾﺮﮐ ﻅﻮﻔﺤﻣ ﮟﯿﻣ ﺯﮈﻮﻟ ﻥﺅﺍﮈ",
"auto_generate_subaddresses": "آٹو سب ایڈریس تیار کرتا ہے"
"auto_generate_subaddresses": "آٹو سب ایڈریس تیار کرتا ہے",
"invalid_password": "غلط پاسورڈ",
"unlock": "غیر مقفل",
"enter_wallet_password": "پرس کا پاس ورڈ درج کریں",
"repeat_wallet_password": "بٹوے کا پاس ورڈ دہرائیں",
"wallet_password_is_empty": "پرس کا پاس ورڈ خالی ہے۔ پرس کا پاس ورڈ خالی نہیں ہونا چاہئے",
"repeated_password_is_incorrect": "بار بار پاس ورڈ غلط ہے۔ براہ کرم دوبارہ پرس کا پاس ورڈ دہرائیں۔"
}

8
res/values/strings_yo.arb
View file

@ -681,5 +681,11 @@
"monero_light_theme": "Monero Light Akori",
"select_destination": "Jọwọ yan ibi ti o nlo fun faili afẹyinti.",
"save_to_downloads": "Fipamọ si Awọn igbasilẹ",
"auto_generate_subaddresses": "Aṣiṣe Ibi-Afọwọkọ"
"auto_generate_subaddresses": "Aṣiṣe Ibi-Afọwọkọ",
"invalid_password": "Ọrọ igbaniwọle ti ko wulo",
"unlock": "Sisalẹ",
"enter_wallet_password": "Tẹ ọrọ igbaniwọle apamọwọ",
"repeat_wallet_password": "Tun ọrọ igbaniwọle apamọwọ naa",
"wallet_password_is_empty": "Ọrọ igbaniwọle apamọwọ ti ṣofo. Ọrọ igbaniwọle apamọwọ ko yẹ ki o ṣofo",
"repeated_password_is_incorrect": "Ọrọ igbaniwọle tun jẹ aṣiṣe. Jọwọ tun ọrọigbaniwọle apamọwọ lẹẹkansi."
}

8
res/values/strings_zh.arb
View file

@ -692,5 +692,11 @@
"monero_light_theme": "门罗币浅色主题",
"select_destination": "请选择备份文件的目的地。",
"save_to_downloads": "保存到下载",
"auto_generate_subaddresses": "自动生成子辅助"
"auto_generate_subaddresses": "自动生成子辅助",
"invalid_password": "无效的密码",
"unlock": "开锁",
"enter_wallet_password": "输入钱包密码",
"repeat_wallet_password": "重复钱包密码",
"wallet_password_is_empty": "钱包密码为空。钱包密码不应为空",
"repeated_password_is_incorrect": "重复密码不正确。请再次重复钱包密码。"
}

8
scripts/android/app_env.sh
View file

@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
APP_ANDROID_TYPE=$1
MONERO_COM_NAME="Monero.com"
MONERO_COM_VERSION="1.5.1"
MONERO_COM_BUILD_NUMBER=55
MONERO_COM_VERSION="1.6.0"
MONERO_COM_BUILD_NUMBER=56
MONERO_COM_BUNDLE_ID="com.monero.app"
MONERO_COM_PACKAGE="com.monero.app"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.8.1"
CAKEWALLET_BUILD_NUMBER=168
CAKEWALLET_VERSION="4.9.0"
CAKEWALLET_BUILD_NUMBER=169
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"

8
scripts/ios/app_env.sh
View file

@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
APP_IOS_TYPE=$1
MONERO_COM_NAME="Monero.com"
MONERO_COM_VERSION="1.5.1"
MONERO_COM_BUILD_NUMBER=53
MONERO_COM_VERSION="1.6.0"
MONERO_COM_BUILD_NUMBER=54
MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.8.1"
CAKEWALLET_BUILD_NUMBER=176
CAKEWALLET_VERSION="4.9.0"
CAKEWALLET_BUILD_NUMBER=178
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
HAVEN_NAME="Haven"

4
scripts/linux/app_env.sh
View file

@ -14,8 +14,8 @@ if [ -n "$1" ]; then
fi
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="1.0.2"
CAKEWALLET_BUILD_NUMBER=3
CAKEWALLET_VERSION="1.1.0"
CAKEWALLET_BUILD_NUMBER=4
if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
echo "Wrong app type."

4
scripts/macos/app_env.sh
View file

@ -15,8 +15,8 @@ if [ -n "$1" ]; then
fi
CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="1.1.1"
CAKEWALLET_BUILD_NUMBER=29
CAKEWALLET_VERSION="1.2.0"
CAKEWALLET_BUILD_NUMBER=31
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then