From a8e597d5e972ec10d0ce511208c315499eadbe7e Mon Sep 17 00:00:00 2001 From: Rafael Saes Date: Thu, 7 Sep 2023 15:40:54 -0300 Subject: [PATCH] Squashed commit of the following: commit 9c64229673787c7a73b12a12954fd11c742fe1ce Author: Rafael Saes Date: Thu Sep 7 11:40:17 2023 -0300 merges commit dcebe3ee66cae830707ba55d144d6bb431a28731 Merge: 1b3b7b35 e39d5c6a Author: Rafael Saes Date: Wed Sep 6 18:26:59 2023 -0300 merges commit e39d5c6af4461946007dfe68b2cbcbdbd9c33c86 Author: Rafael Saes Date: Wed Sep 6 17:44:55 2023 -0300 Merge main into cw-linux commit 39cfa265b0041c59276d7df5d63613ffd5a91aa5 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 0a30e6d9e1d13795219b66a6fdf2c1d218479089. * refactor: rename to WalletChangeListener * fix: _init also behaves on wallet change commit 39d3499d07682dd0b3446040807af448cdfb8ec3 Author: Rafael Saes Date: Wed Sep 6 16:05:26 2023 -0300 Merge remote-tracking branch 'origin/linux/password-direct-input' into cw-linux commit 1b3b7b357ef4bb2f9d7581f57367e073315672ef Author: OmarHatem Date: Sat Sep 2 04:19:03 2023 +0300 Fetch new changes Fix conflicts Update Linux version commit 9687876c32330ad056b78980feb1665e99c7d9b3 Merge: bd987a8d 70d32aa5 Author: OmarHatem 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 70d32aa5037829568732df94cb69f863f72ae632 Author: OmarHatem Date: Fri Sep 1 21:16:58 2023 +0300 New versions commit bd987a8d0470e9344f2f19de39d7a4cd0620771e 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 0a30e6d9e1d13795219b66a6fdf2c1d218479089. * refactor: rename to WalletChangeListener * fix: _init also behaves on wallet change commit 256c48d61a525318a8b90d5fdd21a4842de953f2 Author: Rafael Saes Date: Mon Aug 28 16:44:03 2023 -0300 fix: string conflicts issues commit 3751d045a330b3fb45a6d98f9227dac7ed657c80 Merge: 99998168 2bce18d2 Author: Rafael Saes Date: Mon Aug 28 16:35:32 2023 -0300 Merge remote-tracking branch 'origin/linux/password-direct-input' into cw-linux commit 2bce18d240fada4e554a74b3ae36423763b5bf09 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 af9b5ff10ce2a6a59afa94e17658c25d65a20c99. * 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 ecdc7baa2e3c8f46c3c5013f56c8b864f088ec9f. * 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 * 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 commit 8cf2715539b9c210a3c1f7b537fad4e44b71afed Author: OmarHatem Date: Fri Aug 11 19:18:43 2023 +0300 Merge new version changes Update Linux version commit 9af7e146a4d43b3c22bb2006709c47ac26241a9d Merge: cb295333 6d812c99 Author: OmarHatem 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 6d812c999b66a8c9037cf8931688b7ef06d5a863 Author: OmarHatem Date: Fri Aug 11 17:33:38 2023 +0300 Add Version 4.8.1 configs commit ecdc7baa2e3c8f46c3c5013f56c8b864f088ec9f Author: OmarHatem Date: Fri Aug 11 17:30:24 2023 +0300 Revert "Cw 397 chatwoot live support (#1011)" This reverts commit af9b5ff10ce2a6a59afa94e17658c25d65a20c99. commit cb295333afeada8fcf56e0bcd72c118f862c8a1e Author: Omar Hatem Date: Tue Aug 8 16:58:07 2023 +0300 Add Encryption file utils to Ethereum (#1025) commit 5ce1fbb1e44487d8ccf4e0f0d4f64297a51fb5fe Author: OmarHatem Date: Mon Aug 7 20:40:51 2023 +0300 Add Ethereum to Linux Fix conflicts with main commit d106e14e745d32d13273d850f39c6aeebab752a4 Merge: 9164d05f d1684f5b Author: OmarHatem 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 9164d05feea4df4839518977c69e34999586fe99 Merge: 8a7ef39f e34ba6cf Author: OmarHatem 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 8a7ef39f198eb6e4b66b15d09fef932469c27fdc 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 62007975e1693b061fa87b00fac6cf1879f0f501 Author: Omar Hatem 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 commit f51f0a1d1fdcbeff2fbe6d9ba7e8e4c490dd3bfb Merge: 459a40bc d7fa9991 Author: OmarHatem 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 459a40bcd9f82b0fbbcd3e5f5edc726dd1a66a2a Merge: e9582f31 7d77a167 Author: OmarHatem Date: Thu Jul 13 18:59:49 2023 +0300 Merge remote-tracking branch 'origin/linux/password-direct-input' into linux/password-direct-input commit e9582f31e59238a18c4febfa947ae496c56edd20 Merge: fc18b2dc ff420c7c Author: OmarHatem 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 7d77a167ac2b161a8a3bf4fd0adea9f93eed4b34 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 commit 1ca09e692d7dce0293364a5ca05db867673ab899 Author: Serhii 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 424cf2e635d91c0a8ee98877ee532dc2877bfdcf, reversing changes made to e1fe03ca28c19bb6fc39776665ced8d09975664f. commit 02eead0014b8433ccb877f803c744563de8f0b71 Author: Serhii Date: Thu Jun 29 16:38:36 2023 +0300 Revert " fix routing and context issue" This reverts commit e1fe03ca28c19bb6fc39776665ced8d09975664f. commit 424cf2e635d91c0a8ee98877ee532dc2877bfdcf Merge: e1fe03ca fc18b2dc Author: Serhii 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 e1fe03ca28c19bb6fc39776665ced8d09975664f Author: Serhii Date: Thu Jun 29 14:00:12 2023 +0300 fix routing and context issue commit fc18b2dc52488ae6815f5b25d1d2f278e2972113 Author: OmarHatem Date: Fri Jun 16 22:25:27 2023 +0300 - Pump Linux version - Fix conflicts with main commit 2da9112aa209b8738ecba8563e2a9c54acafa091 Merge: e592c892 3f2af133 Author: OmarHatem 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 3f2af1334d9bfb8bff2920be1deac823f2c091f6 Author: OmarHatem Date: Fri Jun 16 21:43:33 2023 +0300 Pump app versions and update release notes commit 8ffad4bf80858d675f419b759d56bc7e76fb5124 Author: OmarHatem Date: Fri Jun 16 19:54:34 2023 +0300 Revert removing swipe to delete wallet feature commit 337bfd052784c082c5481a7eae980b3d657d8f8b Author: OmarHatem 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 e592c892cc057bf824866000276b11763f972397 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 76559e50d64c86e022abac6a9c75f3e8f4552db8 Author: OmarHatem Date: Fri May 26 21:52:02 2023 +0300 Remove secure storage commit 825c99094f7e7d01bf213acd2c98391b009465cb Merge: 5ba313cb 19cbc40e Author: OmarHatem 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 5ba313cb13dab4c07d4947772b77415a5f9ba810 Author: OmarHatem Date: Fri May 26 16:43:30 2023 +0300 Fix Conflicts with main commit 53d3db53407bf4872ee4cb8db8725203a5c9c212 Merge: 3ddb6c0a 75c65d67 Author: OmarHatem 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 3ddb6c0a40198611a65782450c239365508c3d12 Author: M Date: Thu Apr 27 21:17:41 2023 -0400 Add flatpak section to Linux build guide. commit 89980cac5add6dbe869949296219e6275dccec3d Author: M Date: Thu Apr 27 20:51:35 2023 -0400 Add flatpak manifest. Add desktop file for Linux. commit 0dc2effe4135963ec7de9107eb68f5cfd85757fc Author: M Date: Tue Apr 25 16:44:14 2023 -0400 Add check gcc and troubleshooting section to Linux build guide. commit d4b96d6f9849c8c0a0ee43a8179092453a6ad024 Author: M Date: Fri Apr 21 18:08:42 2023 -0400 Add build guide for Linux. commit c7138a9124d084e7b329b8d4970103f4299a2568 Author: M Date: Fri Apr 21 18:06:05 2023 -0400 Make `model_generator.sh` executable. commit d45df36238b2b5483429847d5e00deed6d2cfa28 Author: M 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 5c2490e721589768452a997d18b6777ad16bc3b3 Author: M 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 d251539f13ce2528ac2854e7e8cf6a57d132c3b5 Author: M Date: Fri Apr 21 11:48:02 2023 -0400 Change package_info to package_info_plus commit a90966b640bab073d8b9c5d998bb239bdf90326a Author: M Date: Wed Apr 19 17:20:04 2023 -0400 Remove unused constant MONERO_BLOCK_SIZE in ios/Classes/monero_api.cpp commit d34dca99edacb9a835c8225cfcca809262b6c8a1 Author: M 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 2ff6cf43b3dc4ff51606f5f1f5b6c3a422ae2651 Merge: 2e19e9d2 27961f2f Author: M 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 2e19e9d2b63b007da6129289be83d1302c396cdc Author: M 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 9cd02b7541068ba638f80d18b0f8bcae0a0586a0 Merge: 8efedbcc 786ba3b0 Author: M 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 8efedbccf6380fe7f2d1993293b35d0a2583d979 Author: M Date: Thu Apr 13 19:48:51 2023 -0400 Add ability to set custom data application directory commit f52c45b167e05f782040d3ae9a30d7283800fd29 Author: M 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 3b82a390c14342be1afd9e72a01206f0a5425b03 Author: M 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 a70b6f298c6f9e807fe45fa55f628fe7b28cb207 Merge: f0164db4 14a4d413 Author: Omar Hatem Date: Mon Feb 27 15:11:54 2023 +0200 Merge pull request #804 from cake-tech/desktop-ui-enhancements Desktop UI enhancements commit 14a4d41339e519e869f28eea7e11536d55cb6758 Author: OmarHatem Date: Sat Feb 25 00:07:15 2023 +0200 Fixate MobX version to fix restore issue commit e8fa3953b5e432dfe5906e6ea0a1a07b13f49e5f Author: OmarHatem Date: Fri Feb 24 17:17:30 2023 +0200 Fix Navigation animation for settings screens commit 89aaa9bfef62e8882f721d2251e8963ca80b6299 Author: OmarHatem Date: Fri Feb 24 15:49:37 2023 +0200 Add back wallet settings page to desktop settings actions commit 26a7bfcee57c9d8c5939d6882fb54ca396dceba4 Merge: f00dc913 f0164db4 Author: OmarHatem 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 f0164db47f0265e7c14f2b0a5aa51f0c35e81a88 Merge: f050f022 143a6eec Author: Omar Hatem 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 143a6eecf51853cca13db8c32e6f76a87772214e Author: OmarHatem Date: Fri Feb 24 15:38:05 2023 +0200 pop only PIN screen after successful auth commit a210a1e325ad203b4d44af3553084d1689a15b36 Merge: 538220f7 f050f022 Author: OmarHatem 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 f00dc9132c5dfa2ba1b6f594eb1dc70cd0da96cc Author: OmarHatem Date: Fri Feb 24 15:19:59 2023 +0200 Fix UI issues Add missing translation commit 05b1bb05c4764b430dcab9278e1799c13a060153 Author: OmarHatem Date: Fri Feb 24 15:18:31 2023 +0200 Enable adding contact from send screen commit b7e92379635112da13728f3cd3d28fe152c1be5a Author: OmarHatem Date: Fri Feb 24 15:18:01 2023 +0200 Add Nano currency image commit 538220f7bc6b60002e30498a2bc894e4a04c3152 Author: Godwin Asuquo Date: Fri Feb 24 14:50:19 2023 +0200 Add assertion to avoid null commit 770ed710d7ddaf391795c6c5ff131d1b27e63407 Author: Godwin Asuquo Date: Fri Feb 24 14:24:40 2023 +0200 Add app lock feature on mac commit f050f022b668a327ff3828c72a031bbddae24aab Merge: f8acc1c0 ac099075 Author: OmarHatem 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 f8acc1c007d5556d07cf9fb559fa90637af4f38a Merge: 67503f39 d3eb22e1 Author: Omar Hatem 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 d3eb22e1d4e84a4c65debcb1eff00cfdf2efd38e Author: Godwin Asuquo Date: Thu Feb 23 21:16:28 2023 +0200 Replace removed code commit 8d482464d95275c5b720c63863dea7f63d0773d7 Author: Godwin Asuquo Date: Thu Feb 23 18:56:20 2023 +0200 Fix ionia input field alignment commit 67503f393dcf54c2219c1951e2e34d1607c7984b Merge: 99344600 016bca01 Author: Omar Hatem 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 016bca01f4fa8a235a8f97dcb3b542680cfb0c38 Author: Godwin Asuquo Date: Thu Feb 23 18:18:40 2023 +0200 remove unused code commit 9934460004ca694f38d944051e1c1f2a479f9cee Merge: 7a504abc bba0ce2e Author: Omar Hatem 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 bba0ce2ec64e25f313d1c7a7da995e932ccf9ef5 Author: Godwin Asuquo Date: Thu Feb 23 18:03:44 2023 +0200 Remove autofocus commit 28c599e68ab9a5f25b7d442efb5957b04682a413 Merge: d5e9982e 7a504abc Author: Godwin Asuquo 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 d5e9982e9122e9b003dc3d3a3cf7782e374f03ab Author: Godwin Asuquo Date: Thu Feb 23 16:03:20 2023 +0200 override navbar with desktopnavbar commit 7a504abc01ca6db37660bf849ec2d812d25b7a1c Merge: c05d70b1 9616974d Author: Omar Hatem 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 9616974d33ef308705a66b5aac83836e122ac31d Merge: 75d52794 24dc9bea Author: Omar Hatem 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 24dc9bea27c93f4c74906ebec2325ef058992f94 Author: Godwin Asuquo Date: Wed Feb 22 18:47:00 2023 +0200 remove space commit 6dc4eafff48f6f53c0f437429aef0598345a0b83 Author: Godwin Asuquo Date: Wed Feb 22 18:44:49 2023 +0200 Fix dropdown change state bug Hide scanner for desktop commit c41b6b7f89fefbee53bd48dc18fec8d6f8587a08 Author: Godwin Asuquo Date: Wed Feb 22 16:17:26 2023 +0200 Fix alignment in create and restore wallet screens commit 07f6f43e0ba43825abd1c1670b2360e51721ddf5 Author: Godwin Asuquo Date: Tue Feb 21 22:05:02 2023 +0200 refactor dropdown items commit 88e245e480ed4d82d36eea52c0b857899deb3483 Author: Godwin Asuquo Date: Tue Feb 21 12:22:32 2023 +0200 Fix issues from code review commit c05d70b1185187235bfd19a21db44577add35f04 Author: OmarHatem Date: Tue Feb 21 01:52:47 2023 +0200 Fix variable name commit 44b1eec81db6d47ead7d49eae64010519815c77c Author: Godwin Asuquo Date: Mon Feb 20 23:24:19 2023 +0200 Fix Popup width constraint and add focus orders commit 17aa72e460802d18fe486841ca97941e0f18561a Merge: 1b892288 c920b62a Author: Omar Hatem 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 cf125d1e069a3185305b79d7e0f327799f05ad56 Author: Godwin Asuquo Date: Sat Feb 18 14:23:48 2023 +0200 Fix issue from code review commit c920b62aa09e53e6c0f3e85aa60d8c230ca26734 Author: OmarHatem Date: Sat Feb 18 00:13:51 2023 +0200 Add onFieldSubmitted to allow "enter" button interaction commit 59a79242af2f85a2b4b9bd7ab2ccf0163c49504a Author: Godwin Asuquo Date: Fri Feb 17 19:06:41 2023 +0200 Fix input field commit 52468e13310d02b8e53249b07bfbaa9e269e5981 Author: Godwin Asuquo Date: Fri Feb 17 18:19:26 2023 +0200 Fix desktop background color and address book view issues commit 4bc81242fc506888a5592197ec45304936642c40 Author: Godwin Asuquo Date: Fri Feb 17 16:41:49 2023 +0200 Add create and restore wallet options to dropdown menu commit 75d52794f48e02ef66982e598b39099a4ef3c802 Merge: e0970fa1 1b892288 Author: Godwin Asuquo 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 e0970fa182c98fd038ae3559116c263c771c520e Author: Godwin Asuquo Date: Thu Feb 16 18:05:10 2023 +0200 fix pageview controller reset index commit 1b89228893b2218248709c7825e91e2a0083dc02 Merge: bb05573c 4027ea04 Author: Omar Hatem 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 4027ea04eb573f36522f36c350758848545318f6 Merge: dd13172c 0015f41a Author: Omar Hatem 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 0015f41a0dbe8fa0620b556d7193ce5f79be4dca Merge: 5a77aa20 55bf964a Author: Omar Hatem 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 55bf964a27bb102670cb12b91f9941afe763f495 Author: OmarHatem Date: Thu Feb 16 17:51:52 2023 +0200 - Use close icon on main screens - Minor UI fixes commit 5296a2118a6a72861a7af119085567ad88a87de6 Author: OmarHatem Date: Wed Feb 15 23:50:15 2023 +0200 Remove duplicated constrains commit 2496a6574acf47c6de0571c373303ee0108db01a Author: Godwin Asuquo Date: Wed Feb 15 22:14:07 2023 +0200 remove unnecessary code commit f0c49528096f1628f661282a890452a8e929c4e2 Author: Godwin Asuquo Date: Wed Feb 15 22:13:24 2023 +0200 remove unnecessary code commit 3dcf5b05a559eedcff0cd28b785bdbb26a24c76d Author: Godwin Asuquo Date: Wed Feb 15 22:11:34 2023 +0200 Fix wallet create in settings commit 8de9c80fe1f13668d21e781801c05c073746cede Author: OmarHatem Date: Wed Feb 15 20:55:06 2023 +0200 Rename misleading variable Change initial mac window size commit f8d70e7ce6c4e6eb06bf3c4a3ef33fda01a525f9 Author: OmarHatem Date: Wed Feb 15 16:07:46 2023 +0200 Fix UI issues, paddings and alignments commit b1947426fb79d9a571b3c728a138d15140a68bbc Merge: 843db656 5a77aa20 Author: OmarHatem 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 843db65603337a51056548b1ea414ea2e39fc2d5 Author: OmarHatem Date: Wed Feb 15 01:28:10 2023 +0200 Add width constraints to desktop dashboard commit 5a77aa201770419f1d2b5554a8d9a20d6dba5b77 Merge: 107e136f 6caeae28 Author: Omar Hatem 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 6caeae2817fc576cba754b3ca6b936f46db57e87 Author: Godwin Asuquo Date: Tue Feb 14 21:55:13 2023 +0200 Add padding to support page commit ea09bba0fb07c6f4fbbd8f00eb5775f78cd6a208 Author: Godwin Asuquo Date: Tue Feb 14 21:53:17 2023 +0200 Make side menu items toggle back to dashboard commit 02fe3c008f932a5f98a25c8febace2de4eb7e0e5 Author: OmarHatem Date: Tue Feb 14 18:05:44 2023 +0200 Constrain primary Buttons width commit fb5efc04295c48ded179e4eb638b1c98d2222d91 Author: OmarHatem Date: Tue Feb 14 18:01:24 2023 +0200 Fix Desktop dashboard actions background color commit 8f762329370914070edcaf6ea11b3543fac471b6 Author: OmarHatem 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 bd04383b7c68ba055cf352bee458ea2f8280208b Author: OmarHatem Date: Tue Feb 14 01:36:34 2023 +0200 Change Exchange page UI depending on platform commit 10b877f55e3a46d2566115bb97ea949cf475f803 Merge: 107e136f dd13172c Author: OmarHatem 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 dd13172cfeb701dcccf0d9809bc0744632aa0ef4 Author: OmarHatem Date: Sat Feb 11 00:41:48 2023 +0200 Add max width constrain to Welcome page commit 107e136f523667e7e7f06bcb75e36b98a79c49fa Author: Godwin Asuquo Date: Sat Feb 11 00:35:11 2023 +0200 remove empty line commit bdfe070f8dba385854063da56f9dfecbafcb3529 Author: Godwin Asuquo Date: Sat Feb 11 00:32:26 2023 +0200 Refactor sidebar state management commit 770e3b6f52e169597a1351da84c30104bc47cafd Merge: 99bb3cce 5fa50c76 Author: Omar Hatem 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 5fa50c76684e6b784c96e28121912d9948c958a5 Author: OmarHatem Date: Fri Feb 10 23:27:19 2023 +0200 Fix Constrained width screens UI commit c1bf0ee7aa6e5ee6834649601ef8d15634c559d1 Merge: eb3b2464 99bb3cce Author: OmarHatem 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 99bb3cce479fe49dc185bb76fd26391fd5a0ea50 Merge: 2623546b 3fb8be00 Author: Omar Hatem 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 3fb8be0053be0e4a475ef1adbcd7dfa86db88b64 Merge: 887afdad 2623546b Author: OmarHatem 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 2623546b5e422f5394aa97ff90a196769ca5d9d3 Merge: 2b2bebe9 2ea360d8 Author: Omar Hatem 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 887afdadd002c7f73786b7c67ac5f49cfb23a811 Author: OmarHatem Date: Fri Feb 10 20:39:23 2023 +0200 Change ionia welcome page animation commit 2b2bebe98f45b30bcd7eaaf74c40fb79ab49f845 Author: OmarHatem Date: Fri Feb 10 20:26:07 2023 +0200 Refresh desktop dashboard actions on wallet change commit eb3b24643746e81ac4eb5f95879488cb4a92a8a1 Author: Godwin Asuquo Date: Fri Feb 10 20:19:13 2023 +0200 Add empty trailing to center page title on desktop commit 32d2bf2c850fa9d81d86f9363a3d1681fdefa296 Author: Godwin Asuquo Date: Fri Feb 10 20:07:53 2023 +0200 Update widget contraints commit 89fe8df459891e7d69f15c3e04d3590bba88d800 Author: Godwin Asuquo Date: Fri Feb 10 19:45:48 2023 +0200 Update trailing icon to open transaction page commit 6d49e6a5433495f9054dc26953dc065d84bf33f8 Author: OmarHatem Date: Fri Feb 10 18:40:50 2023 +0200 Add Marketplace to dashboard view commit 2ea360d81de9cca608e02cbc9577daa998727ca2 Author: OmarHatem Date: Fri Feb 10 18:15:05 2023 +0200 Fix desktop nav bar UI commit 677305f6257669dea097e8c82f8d019621f1cf93 Author: OmarHatem Date: Thu Feb 9 22:53:02 2023 +0200 - Listen to keyboard events in PIN screen - Fix PIN buttons style commit 1831ebf435867c84b3252a4684f644052cf68b09 Author: Godwin Asuquo Date: Thu Feb 9 20:29:38 2023 +0200 Remove drawer from mac os commit 150d43b2da1d64a409829adc395e932481f415cd Author: Godwin Asuquo Date: Thu Feb 9 20:11:20 2023 +0200 constraint images and pincoded box commit a116241185df8c0497334d2f48da4cc9404fec62 Author: OmarHatem Date: Thu Feb 9 19:17:52 2023 +0200 Separate Dashboard desktop view from mobile view commit 5c89c42540131a99978c22712982d883e24be5be Author: Godwin Asuquo Date: Thu Feb 9 16:53:07 2023 +0200 [skip ci] remove .project changes commit dd2bf60b0102f3b3593da8a23359ad79823ab6b6 Author: Godwin Asuquo Date: Thu Feb 9 16:51:49 2023 +0200 [skip ci] remove .project changes commit 167eae1293dbcfb473e486754e943c4311c03fee Author: OmarHatem Date: Thu Feb 9 16:10:43 2023 +0200 Revert changes in .gitignore commit 30d16266c0e4d82c75f54c1df859d2d7264e3326 Author: OmarHatem Date: Thu Feb 9 16:02:02 2023 +0200 Revert removing .lock files commit 3c17310a5ba8e7c41ccae11b8709ada26ed98629 Author: Godwin Asuquo Date: Wed Feb 8 22:12:11 2023 +0200 [skip ci] reformat desktop dashboard commit 48ae156eb85b0dad6f7a74a875d1a4a5df1dc637 Author: Godwin Asuquo Date: Wed Feb 8 21:57:26 2023 +0200 [skip ci] reformat desktop dashboard commit b1b81930434dd5e15333f2747d4bdf5182169b32 Author: Godwin Asuquo Date: Wed Feb 8 20:41:46 2023 +0200 Fix issues from code review commit a1abdc849a791cdc782b01de673ec6c460e56dae Author: Godwin Asuquo Date: Wed Feb 8 18:56:00 2023 +0200 Fix bug on sidebar reset commit 3f03fb0b18d1745fdb735bd5ff95c99068ee6da2 Merge: 69651b3e 9f69de80 Author: Omar Hatem 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 9f69de8057d145d968d24e829be8f5fddab786be Author: OmarHatem Date: Wed Feb 8 15:49:26 2023 +0200 Remove Podfile.lock from cache commit 738621254f18fc40fd4dbba430dd2d879fed062b Author: OmarHatem Date: Wed Feb 8 15:46:57 2023 +0200 Add pubspec.lock and Podfile.lock to gitignore commit 26b79fe0cd679d4e0cc7ad45b2fd7413770dcf54 Author: OmarHatem 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 dea81f92e368cf98cdb38e9db59d3f90aa0ba06b Merge: c7db7b99 69651b3e Author: OmarHatem 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 69651b3eb403d50bdebe08780f99fb920327e5be Author: Godwin Asuquo Date: Tue Jan 31 15:30:46 2023 +0200 Remove constants commit c7db7b99a50c859c9ddaf2d3e9ee21f96918e68b Merge: 9ed77cd6 4902dc8d Author: OmarHatem 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 4902dc8dd4d32c2c7fbb2a8b64c47e0164ec0421 Merge: d12bcc80 bb05573c Author: Godwin Asuquo 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 9ed77cd6f904d235f6bbcc22cbbfecd30018466e Merge: d12bcc80 bb05573c Author: OmarHatem 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 bb05573c3aa01994e4ecee678d7c870a4784d5fa Merge: de2b887a c20eb232 Author: Omar Hatem Date: Mon Jan 30 23:33:44 2023 +0200 Merge pull request #753 from cake-tech/mac-os-icons Mac os icons commit d12bcc80d1e61e52b07f1c21b0fdd8fd33146e66 Author: Godwin Asuquo Date: Mon Jan 30 23:32:31 2023 +0200 Fix exchange page as fullScreenDialog commit de2b887a9b3ce8896334c3c262fac9f4cf9c9895 Merge: abf5f0b7 adfebe69 Author: OmarHatem 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 c20eb2325e4c197a6485cd43413c469f6e8e7041 Author: OmarHatem Date: Mon Jan 30 23:28:15 2023 +0200 Change Mac os app name and bundle id commit deadc93a76aa4b081228ef85ec88a486638ef432 Author: Godwin Asuquo Date: Mon Jan 30 23:23:42 2023 +0200 fix dashboard sidebar and responsive utils commit abf5f0b7c67d6a0053809fb51117b4522a012c23 Merge: b6666ca4 5b50ea05 Author: Omar Hatem Date: Mon Jan 30 22:28:24 2023 +0200 Merge pull request #754 from cake-tech/desktop-appbar-view Desktop AppBar commit 94184d69d612eab1ae505056419d0820c9c7d7c7 Author: Godwin Asuquo Date: Mon Jan 30 17:26:40 2023 +0200 localize settings commit d5957b987368fcc671999c4a8bb673d12e670fa3 Author: OmarHatem Date: Mon Jan 30 16:01:37 2023 +0200 Generate MacOS icons commit 5b50ea053e1bf0cf5f5f962561818391bb97ab27 Author: OmarHatem Date: Sun Jan 29 16:49:42 2023 +0200 Add Wallet selection dropdown to dashboard desktop view commit b6666ca405578a8d71734cd11f30ac0d27655542 Author: OmarHatem Date: Sat Jan 28 17:13:34 2023 +0200 Ignore increasing brightness for non-mobile platforms commit 75f33a433e9c4ac8a619d7298f16b1bee2231424 Author: Godwin Asuquo Date: Sat Jan 28 12:43:44 2023 +0200 refactor desktop settings sidebar commit adfebe69403dd8d0350f58b89652fea0ff49837c Author: OmarHatem Date: Thu Jan 26 20:53:26 2023 +0200 Temporarily fetch unstoppable domains only on mobile commit 132033207e594929b0432df57f335cab0fc4dc35 Author: OmarHatem Date: Thu Jan 26 02:33:15 2023 +0200 Remove unstoppable domain from macos since it's not supported commit 409c13a77a65aee1eeafbef4b7a8f21fb98c65e0 Author: OmarHatem Date: Thu Jan 26 02:25:28 2023 +0200 Remove wake lock native code and just use the ready made package commit 90a7432bf9de1f969df7857b9aa539303558be2c Author: OmarHatem 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 6b2bf313a372168d61e90708ed025535c01cc6f8 Merge: 42a28d42 e8c1d863 Author: OmarHatem 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 20ae8d530f19cc9cdfdb5b1407235c77225f4e83 Author: Godwin Asuquo Date: Wed Jan 25 16:17:50 2023 +0200 [skip ci] Add desktop sidebar commit ba09a24d53945397708e027fadcab6aa782038fa Author: Godwin Asuquo Date: Wed Jan 25 16:14:34 2023 +0200 [skip ci] Add desktop sidebar commit 4f1f51e0aa990490dae3ba3f31e54782f4b6cf06 Author: Godwin Asuquo Date: Wed Jan 25 15:57:56 2023 +0200 Add desktop sidebar commit e8c1d863731496c9ce1ee8b1404e9b7a78bb9a68 Author: OmarHatem Date: Wed Jan 25 02:38:28 2023 +0200 Add platform channel specific code for mac os commit 4aebbdace7e17828f208941e41f2f1bd67d78a78 Author: OmarHatem Date: Wed Jan 25 00:14:28 2023 +0200 Revert mac os version commit fa072ff2f11d15e3f61d4068dfcdceb67e08b767 Author: OmarHatem Date: Wed Jan 25 00:11:18 2023 +0200 Revert mac os version commit 6e03d2933dcfec9a466b528f410d75b4933854da Author: OmarHatem Date: Wed Jan 25 00:07:11 2023 +0200 Revert back to Cake fork for secure storage commit c3c81f7685d532f8f2cbc31b27470a3874537907 Author: OmarHatem Date: Tue Jan 24 23:58:06 2023 +0200 Revert back to Cake fork for secure storage commit d41e7b7bab6ae5bcaa75a59a4a2a4fbf7cb17bdc Merge: ed0d87c8 ae3620b1 Author: OmarHatem 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 ed0d87c89321c8772692f72d4207c242f1602d88 Author: OmarHatem Date: Fri Jan 20 17:45:54 2023 +0200 Update deployment target to 10.13 commit dac7f8e1b3293dbcee01b6bd1ab72a464edb737d Author: OmarHatem Date: Fri Jan 20 15:02:08 2023 +0200 Add Bundle ID in entitlements files through app config script commit 786ba3b04283427ae366f9e609be500dc3bb4983 Author: M Date: Thu Jan 19 18:14:46 2023 -0500 Add linux application to the project. commit ae3620b1713538c4eb785b754069e59ec6008875 Author: M Date: Thu Jan 19 15:54:59 2023 -0500 Fix arch match for monero lib for darwin x86_64 -> x86-64 commit 42a28d424645b092b85785f37e1241e395ad3bd3 Author: OmarHatem Date: Thu Jan 19 04:04:20 2023 +0200 Add on Tap to desktop_action_button.dart Remove unused functions commit 42a74393155f21707d964aaf7d341fd1ec324d70 Author: OmarHatem Date: Wed Jan 18 22:11:59 2023 +0200 Change Dashboard view on desktop size screens commit 9f1e663719edebdb6eddf18a889d25b570b92c44 Author: OmarHatem Date: Tue Jan 17 22:06:05 2023 +0200 Add network access to mac commit 456ba28cb2cc4076d8ac7449f0b6efc448ab8230 Author: OmarHatem 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 31fa9e8b19c608247e821541a9da1d60bbe79aa7 Author: M 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. --- assets/text/Monerocom_Release_Notes.txt | 11 +- assets/text/Release_Notes.txt | 12 +- cw_bitcoin/lib/bitcoin_wallet_service.dart | 4 +- cw_bitcoin/lib/litecoin_wallet_service.dart | 4 +- cw_core/lib/wallet_info.dart | 1 - cw_ethereum/lib/ethereum_wallet_service.dart | 3 +- cw_monero/lib/monero_wallet.dart | 1 + ios/Podfile.lock | 35 +----- ios/Runner.xcodeproj/project.pbxproj | 1 + lib/buy/moonpay/moonpay_buy_provider.dart | 42 +++++-- lib/core/backup_service.dart | 1 + lib/core/wallet_loading_service.dart | 21 ++-- lib/di.dart | 6 + lib/entities/get_encryption_key.dart | 5 +- .../changenow_exchange_provider.dart | 2 +- lib/main.dart | 2 +- lib/reactions/check_connection.dart | 2 +- lib/router.dart | 9 ++ .../desktop_wallet_selection_dropdown.dart | 1 + .../dashboard/widgets/transactions_page.dart | 104 ++++++++-------- .../screens/new_wallet/new_wallet_page.dart | 2 +- .../wallet_restore_from_keys_form.dart | 6 +- .../wallet_restore_from_seed_form.dart | 2 +- .../settings/display_settings_page.dart | 112 +++++++++--------- .../support/widgets/support_tiles.dart | 3 +- .../support_chat/support_chat_page.dart | 38 ++++++ .../support_chat/widgets/chatwoot_widget.dart | 62 ++++++++++ lib/src/widgets/search_bar_widget.dart | 2 +- lib/store/settings_store.dart | 1 + .../unspent_coins_list_view_model.dart | 2 - model_generator.sh | 12 +- res/values/strings_ar.arb | 11 +- res/values/strings_bg.arb | 9 +- res/values/strings_cs.arb | 8 +- res/values/strings_de.arb | 10 +- res/values/strings_en.arb | 8 +- res/values/strings_es.arb | 8 +- res/values/strings_fr.arb | 8 +- res/values/strings_ha.arb | 8 +- res/values/strings_hi.arb | 8 +- res/values/strings_hr.arb | 8 +- res/values/strings_id.arb | 8 +- res/values/strings_it.arb | 8 +- res/values/strings_ja.arb | 8 +- res/values/strings_ko.arb | 8 +- res/values/strings_my.arb | 8 +- res/values/strings_nl.arb | 8 +- res/values/strings_pl.arb | 8 +- res/values/strings_pt.arb | 8 +- res/values/strings_ru.arb | 8 +- res/values/strings_th.arb | 8 +- res/values/strings_tr.arb | 8 +- res/values/strings_uk.arb | 8 +- res/values/strings_ur.arb | 8 +- res/values/strings_yo.arb | 8 +- res/values/strings_zh.arb | 8 +- scripts/android/app_env.sh | 8 +- scripts/ios/app_env.sh | 8 +- scripts/linux/app_env.sh | 4 +- scripts/macos/app_env.sh | 4 +- 60 files changed, 508 insertions(+), 231 deletions(-) create mode 100644 lib/src/screens/support_chat/support_chat_page.dart create mode 100644 lib/src/screens/support_chat/widgets/chatwoot_widget.dart diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt index 28449764a..1b5e93dc1 100644 --- a/assets/text/Monerocom_Release_Notes.txt +++ b/assets/text/Monerocom_Release_Notes.txt @@ -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 diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index 28449764a..0bcf0ade6 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -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 diff --git a/cw_bitcoin/lib/bitcoin_wallet_service.dart b/cw_bitcoin/lib/bitcoin_wallet_service.dart index b36a1d021..5aa5ab875 100644 --- a/cw_bitcoin/lib/bitcoin_wallet_service.dart +++ b/cw_bitcoin/lib/bitcoin_wallet_service.dart @@ -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(); diff --git a/cw_bitcoin/lib/litecoin_wallet_service.dart b/cw_bitcoin/lib/litecoin_wallet_service.dart index 093b9096f..a06a8904f 100644 --- a/cw_bitcoin/lib/litecoin_wallet_service.dart +++ b/cw_bitcoin/lib/litecoin_wallet_service.dart @@ -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(); diff --git a/cw_core/lib/wallet_info.dart b/cw_core/lib/wallet_info.dart index 9a41944da..a59b865a6 100644 --- a/cw_core/lib/wallet_info.dart +++ b/cw_core/lib/wallet_info.dart @@ -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'; diff --git a/cw_ethereum/lib/ethereum_wallet_service.dart b/cw_ethereum/lib/ethereum_wallet_service.dart index fa7d7dbfa..289e7d25b 100644 --- a/cw_ethereum/lib/ethereum_wallet_service.dart +++ b/cw_ethereum/lib/ethereum_wallet_service.dart @@ -14,7 +14,7 @@ import 'package:bip39/bip39.dart' as bip39; import 'package:collection/collection.dart'; class EthereumWalletService extends WalletService { + EthereumRestoreWalletFromSeedCredentials, EthereumRestoreWalletFromPrivateKey> { EthereumWalletService(this.walletInfoSource, this.isDirect); final Box walletInfoSource; @@ -75,6 +75,7 @@ class EthereumWalletService extends WalletService 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 requestUrl({required CryptoCurrency currency, required String refundWalletAddress}) async { + Future 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, '', { - 'apiKey': _apiKey, - 'defaultBaseCurrencyCode': currency.toString().toLowerCase(), - 'refundWalletAddress': refundWalletAddress - }); + baseUrl, + '', + { + '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); diff --git a/lib/core/backup_service.dart b/lib/core/backup_service.dart index 9ff7fa98e..9b035ea25 100644 --- a/lib/core/backup_service.dart +++ b/lib/core/backup_service.dart @@ -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'; diff --git a/lib/core/wallet_loading_service.dart b/lib/core/wallet_loading_service.dart index d8221ab16..9596015bc 100644 --- a/lib/core/wallet_loading_service.dart +++ b/lib/core/wallet_loading_service.dart @@ -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 renameWallet(WalletType type, String name, String newName, {String? password}) async { @@ -38,10 +35,10 @@ class WalletLoadingService { } } - Future 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 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); diff --git a/lib/di.dart b/lib/di.dart index 0151ac7a1..95108c15b 100644 --- a/lib/di.dart +++ b/lib/di.dart @@ -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 setup({ getIt.registerFactory(() => SupportPage(getIt.get())); + getIt.registerFactory(() => + SupportChatPage(getIt.get(), secureStorage: getIt.get())); + + getIt.registerFactory(() => SupportOtherLinksPage(getIt.get())); + getIt.registerFactory(() { final wallet = getIt.get().wallet; diff --git a/lib/entities/get_encryption_key.dart b/lib/entities/get_encryption_key.dart index 29effe644..af84bd447 100644 --- a/lib/entities/get_encryption_key.dart +++ b/lib/entities/get_encryption_key.dart @@ -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> getEncryptionKey( {required String forKey, required SecureStorage secureStorage}) async { - final stringifiedKey = await secureStorage.read(key: 'transactionDescriptionsBoxKey'); + final stringifiedKey = + await secureStorage.read(key: 'transactionDescriptionsBoxKey'); List key; if (stringifiedKey == null) { diff --git a/lib/exchange/changenow/changenow_exchange_provider.dart b/lib/exchange/changenow/changenow_exchange_provider.dart index da4e7eccb..997ff206d 100644 --- a/lib/exchange/changenow/changenow_exchange_provider.dart +++ b/lib/exchange/changenow/changenow_exchange_provider.dart @@ -301,4 +301,4 @@ class ChangeNowExchangeProvider extends ExchangeProvider { return tag.toLowerCase(); } } -} \ No newline at end of file +} diff --git a/lib/main.dart b/lib/main.dart index 190974bf3..b5faafb70 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -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'; diff --git a/lib/reactions/check_connection.dart b/lib/reactions/check_connection.dart index 6b7b79941..a29b670e8 100644 --- a/lib/reactions/check_connection.dart +++ b/lib/reactions/check_connection.dart @@ -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; diff --git a/lib/router.dart b/lib/router.dart index 354337aac..c04295383 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -471,6 +471,15 @@ Route createRoute(RouteSettings settings) { fullscreenDialog: true, builder: (_) => getIt.get()); + case Routes.supportLiveChat: + return CupertinoPageRoute( + builder: (_) => getIt.get()); + + case Routes.supportOtherLinks: + return CupertinoPageRoute( + fullscreenDialog: true, + builder: (_) => getIt.get()); + case Routes.unspentCoinsList: return MaterialPageRoute( builder: (_) => getIt.get()); diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart index c5899ca68..92b2886b9 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart @@ -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'; diff --git a/lib/src/screens/dashboard/widgets/transactions_page.dart b/lib/src/screens/dashboard/widgets/transactions_page.dart index be5ad1ab0..537b2c69d 100644 --- a/lib/src/screens/dashboard/widgets/transactions_page.dart +++ b/lib/src/screens/dashboard/widgets/transactions_page.dart @@ -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); }) diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart index cc614453e..a8b8937ae 100644 --- a/lib/src/screens/new_wallet/new_wallet_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_page.dart @@ -212,7 +212,7 @@ class _WalletNameFormState extends State { fontSize: 18.0, fontWeight: FontWeight.w500, color: Theme.of(context).extension()!.hintTextColor), - hintText: S.of(context).repeate_wallet_password, + hintText: S.of(context).repeat_wallet_password, focusedBorder: UnderlineInputBorder( borderSide: BorderSide( color: Theme.of(context).extension()!.underlineColor, diff --git a/lib/src/screens/restore/wallet_restore_from_keys_form.dart b/lib/src/screens/restore/wallet_restore_from_keys_form.dart index 373955767..ba09aa12c 100644 --- a/lib/src/screens/restore/wallet_restore_from_keys_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_keys_form.dart @@ -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 { @@ -152,7 +152,7 @@ class WalletRestoreFromKeysFromState extends State { 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(), diff --git a/lib/src/screens/restore/wallet_restore_from_seed_form.dart b/lib/src/screens/restore/wallet_restore_from_seed_form.dart index 9c193daf3..a55fceb0d 100644 --- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart @@ -148,7 +148,7 @@ class WalletRestoreFromSeedFormState extends State { 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( diff --git a/lib/src/screens/settings/display_settings_page.dart b/lib/src/screens/settings/display_settings_page.dart index 1fa06bbc2..4be30b57a 100644 --- a/lib/src/screens/settings/display_settings_page.dart +++ b/lib/src/screens/settings/display_settings_page.dart @@ -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( - 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( - 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( + 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( + 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), + ], + ), + ); + }), + ); } } diff --git a/lib/src/screens/support/widgets/support_tiles.dart b/lib/src/screens/support/widgets/support_tiles.dart index 1db87953b..7107efac6 100644 --- a/lib/src/screens/support/widgets/support_tiles.dart +++ b/lib/src/screens/support/widgets/support_tiles.dart @@ -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()!.titleColor, ), ), Padding( diff --git a/lib/src/screens/support_chat/support_chat_page.dart b/lib/src/screens/support_chat/support_chat_page.dart new file mode 100644 index 000000000..c7aa3a881 --- /dev/null +++ b/lib/src/screens/support_chat/support_chat_page.dart @@ -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( + future: getCookie(), + builder: (BuildContext context, AsyncSnapshot snapshot) { + print(snapshot.data); + if (snapshot.hasData) + return ChatwootWidget( + secureStorage, + supportUrl: supportViewModel.fetchUrl(authToken: snapshot.data!) + ); + return Container(); + }, + ); + + Future getCookie() async { + return await secureStorage.read(key: COOKIE_KEY) ?? ""; + } +} diff --git a/lib/src/screens/support_chat/widgets/chatwoot_widget.dart b/lib/src/screens/support_chat/widgets/chatwoot_widget.dart new file mode 100644 index 000000000..72e48c3ef --- /dev/null +++ b/lib/src/screens/support_chat/widgets/chatwoot_widget.dart @@ -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 { + 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 storeCookie(String value) async => + await widget.secureStorage.write(key: COOKIE_KEY, value: value); +} diff --git a/lib/src/widgets/search_bar_widget.dart b/lib/src/widgets/search_bar_widget.dart index 731fbf632..dc604934f 100644 --- a/lib/src/widgets/search_bar_widget.dart +++ b/lib/src/widgets/search_bar_widget.dart @@ -17,7 +17,7 @@ class SearchBarWidget extends StatelessWidget { Widget build(BuildContext context) { return TextFormField( controller: searchController, - style: TextStyle(color: Theme.of(context).extension()!.searchTextColor), + style: TextStyle(color: Theme.of(context).extension()!.searchHintColor), decoration: InputDecoration( hintText: hintText ?? S.of(context).search_currency, hintStyle: TextStyle(color: Theme.of(context).extension()!.searchHintColor), diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart index cb2eea111..79afe4a44 100644 --- a/lib/store/settings_store.dart +++ b/lib/store/settings_store.dart @@ -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; diff --git a/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart b/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart index 9ecb381fd..657a0cb74 100644 --- a/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart +++ b/lib/view_model/unspent_coins/unspent_coins_list_view_model.dart @@ -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'; diff --git a/model_generator.sh b/model_generator.sh index f45fe9637..2a06b11d0 100755 --- a/model_generator.sh +++ b/model_generator.sh @@ -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 \ No newline at end of file +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 diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb index 608f2e585..2bd3a3b1d 100644 --- a/res/values/strings_ar.arb +++ b/res/values/strings_ar.arb @@ -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": "كلمة المرور المتكررة غير صحيحة. يرجى تكرار كلمة مرور المحفظة مرة أخرى." } diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb index b558cd300..3a4eb0770 100644 --- a/res/values/strings_bg.arb +++ b/res/values/strings_bg.arb @@ -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": "Многократната парола е неправилна. Моля, повторете отново паролата за портфейла." } diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb index 0d2115ab3..b62f18d0b 100644 --- a/res/values/strings_cs.arb +++ b/res/values/strings_cs.arb @@ -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." } diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 5a795e35d..749514556 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -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." } diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index c56fd5e38..92556056c 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -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." } diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 59702382b..5f86abc32 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -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." } diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index ae62b612b..e56d73bfb 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -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." } diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb index 528ea7c58..4133994e6 100644 --- a/res/values/strings_ha.arb +++ b/res/values/strings_ha.arb @@ -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." } diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index fee7465a8..bf2b9f989 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -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": "बार -बार पासवर्ड गलत है। कृपया फिर से वॉलेट पासवर्ड दोहराएं।" } diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index de9526a1c..fbc06eddc 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -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." } diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb index 75f038f4a..fc6cac400 100644 --- a/res/values/strings_id.arb +++ b/res/values/strings_id.arb @@ -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." } diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index ef62d901b..b2e7fc56a 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -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." } diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index cfb653dbb..3b5f3688b 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -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": "繰り返しパスワードが正しくありません。ウォレットのパスワードをもう一度繰り返してください。" } diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 80197ca70..f8c9d2a5d 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -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": "반복 된 비밀번호가 올바르지 않습니다. 지갑 암호를 다시 반복하십시오." } diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb index 519866937..85c06ebce 100644 --- a/res/values/strings_my.arb +++ b/res/values/strings_my.arb @@ -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": "ထပ်ခါတလဲလဲစကားဝှက်မမှန်ကန်ပါ ကျေးဇူးပြုပြီးပိုက်ဆံအိတ်စကားဝှက်ကိုပြန်လုပ်ပါ။" } diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 4c7f8b298..3cb81f3c3 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -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." } diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index e04cd108a..bd53c4f41 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -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." } diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index c0cfbefe0..7377e2a05 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -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." } diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 0c542bee5..8ccedcd38 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -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": "Повторный пароль неверен. Пожалуйста, повторите пароль кошелька снова." } diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb index 4a45f305f..abe6994fe 100644 --- a/res/values/strings_th.arb +++ b/res/values/strings_th.arb @@ -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": "รหัสผ่านซ้ำไม่ถูกต้อง โปรดทำซ้ำรหัสผ่านกระเป๋าเงินอีกครั้ง" } diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb index acb12c50b..8b7fbca7b 100644 --- a/res/values/strings_tr.arb +++ b/res/values/strings_tr.arb @@ -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." } diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 42c3b50ce..980d4c5c5 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -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": "Повторний пароль невірний. Будь ласка, повторіть пароль гаманця ще раз." } diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb index dd1213959..751cee7b6 100644 --- a/res/values/strings_ur.arb +++ b/res/values/strings_ur.arb @@ -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": "بار بار پاس ورڈ غلط ہے۔ براہ کرم دوبارہ پرس کا پاس ورڈ دہرائیں۔" } diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb index 8cd2f6ebd..59b53ced0 100644 --- a/res/values/strings_yo.arb +++ b/res/values/strings_yo.arb @@ -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." } diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 4dd34e1de..17406d30f 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -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": "重复密码不正确。请再次重复钱包密码。" } diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 741eb8780..627b8d318 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -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" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 401755b40..08de936e8 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -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" diff --git a/scripts/linux/app_env.sh b/scripts/linux/app_env.sh index ac8c7c9df..211c4ef34 100755 --- a/scripts/linux/app_env.sh +++ b/scripts/linux/app_env.sh @@ -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." diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index 1aed1f4fa..28e7d5f4f 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -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