Commit graph

278 commits

Author SHA1 Message Date
OmarHatem
59cf9d0acf Merge branch 'new_versions' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	cw_solana/lib/solana_wallet_service.dart
	lib/core/key_service.dart
2024-03-29 22:42:13 +02:00
Matthew Fosse
78685b74f0
Cw 521 moonpay buy (#1335)
* save

* save

* moonpay fixes

* fix for debug mode

* code cleanup

* another fix for debug mode

* [skip ci] fixes

* test build

* code cleanup

* fix buy page
2024-03-28 15:30:41 +02:00
OmarHatem
411f054a45 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password 2024-03-14 20:26:49 +02:00
Omar Hatem
6414364602
Generic fixes (#1320)
* New price API

* Fix test app package id

* Fix workflow

* change environment variable to use pr number [skip ci]

* Fix un-needed padding

* Fix raw value for usdtSol

* Remove duplicate fetching for balance and transactions at start [skip ci]

* Fix address validation of spl tokens

* Add Service Status

* Update lib/src/widgets/service_status_tile.dart

Co-authored-by: Konstantin Ullrich <konstantinullrich12@gmail.com>

* Update lib/src/widgets/services_updates_widget.dart

Co-authored-by: Konstantin Ullrich <konstantinullrich12@gmail.com>

* Update monero version

* update sodium script

* Change automatic priority fee rate

---------

Co-authored-by: Konstantin Ullrich <konstantinullrich12@gmail.com>
2024-03-10 04:02:30 +02:00
OmarHatem
e27efb7029 Re-add Bitcoin Address types
Fix conflicts with main
2024-03-04 21:54:09 +02:00
OmarHatem
a031b0fe49 Revert "Revert btc address types"
This reverts commit a49e57e3
2024-03-04 21:42:57 +02:00
OmarHatem
ba932d9477 Update Branch
Fix conflicts with main
Update Linux version
2024-03-02 22:53:42 +02:00
OmarHatem
a49e57e342 Revert btc address types 2024-03-02 03:52:20 +02:00
Rafael
a3a35f05e1
Btc address types (#1263)
* inital migration changes

* feat: rest of changes

* minor fix [skip ci]

* fix: P2wshAddress & wallet address index

* fix: address review comments

* fix: address type restore

* feat: add testnet

* Fix review comments
Remove bitcoin_base from cw_core

* Fix address not matching selected type on start

* remove un-necessary parameter [skip ci]

* Remove bitcoin specific code from main lib
Fix possible runtime exception from list wrong access

* Minor fix

* fix: fixes for Testnet

* fix: bitcoin receive option dependency breaks monerocom

* Fix issues when building Monero.com

* feat: Transaction Builder changes

* fix: discover addresses, testnet restoring, duplicate unspent coins, and taproot address vs schnorr sig tweak

* fix: remove print

* feat: improve error when failed broadcast response

* feat: create fish shell env script

* fix: unmodifiable maps

* fix: build

* fix: build

* fix: computed observable side effect bug

* feat: add nix script for android build_all

* fix: wrong keypairs used for signing

* fix: wrong addresses when using fromScriptPubKey scripts

* fix(actual commit): testnet tx expanded + wrong addresses when using fromScriptPubKey scripts (update bitcoin_base deps)

* fix: self-send [skip ci]

* fix: p2wsh

* fix: testnet fees

* New versions

* Update macos build number
Minor UI fix

* fix: use new bitcoin_base ref, fix tx list wrong hex value & refactor hidden vs hd use

- if always use sideHd for isHidden, it is easier to simplify the functions instead of passing both which can be error prone
- (ps: now this could probably be changed, for example from isHidden to isChange since with address list we now see "hidden" addresses)

* Fix if condition to handle litecoin case

* fix: self-send, change address was always making direction incoming

* refactor: improve estimation function, add more inputs if balance missing

* fix: new bitcoin_base update, fixes script issues

* Update evm chain wallet service arguments

* Fix translation [skip ci]

* Fix translation [skip ci]

* Update strings_fr.arb [skip ci]

* fix: async isChange function not being awaited, refactor to reduce looping into a single place

* fix: _address vs address, missing p2sh

* fix: minor mistake in storing p2sh page type [skip ci]

* refactor: use already matched addresses property

* feat: improved perfomance for fetching transaction histories

* feat: continue perfomance change, improve address discovery only to last address by type with history

* fix: make sure transaction list is sorted by date

* refactor: isTestnet only for bitcoin

* fix: walletInfo type null case

* fix: deprecated p2pk

* refactor: make condition more readable

* refactor: remove unnecessary Str variant

* refactor: make condition more readable

* fix: infinite loop possible

* Revert removing isTestnet from other wallets [skip ci]

* refactor: rename addresses when matched by receive type

* Make the beta build [skip ci]
Remove app_env.fish

---------

Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
2024-02-23 18:13:30 +02:00
Adegoke David
109bba4301
CW-555-Add-Solana-Wallet (#1272)
* chore: Create cw_solana package and clean up files

* feat: Add Solana Wallet - Create, Restore form seed, restore from Key, Restore from QR, Send, Receive, transaction history, spl tokens

* fix: Make transactions file specific to solana only for solana transactions

* chore: Revert inject app details script

* fix: Fix issue with node and switch current node to main beta instead of testnet

* fix: Fix merge conflicts and adjust migration version

* fix: Fetch spl token error

Signed-off-by: Blazebrain <davidadegoke16@gmail.com>

* fix: Diplay and activate spl tokens bug

* fix: Review and fixes

* fix: reverted formatting for cryptocurrency class

* fix: Review comments, split sending flow into signing and sending separately, fix issues

* fix: Revert throwing unimplenented error

* chore: Fix comment

* chore: Fix comment

* fix: Errors in flow

* Update provider_types.dart [skip ci]

* fix: Issues with solana wallet

* Update solana_wallet.dart [skip ci]

* fix: Review comments

* fix: Date time config

* fix: Revert bash script for app details

* fix: Error with balance, displaying fees, fixing sent or received identifier bug, displaying token symbol with token transaction item in transactions list

* fix: Issues with address validation when sending spl tokens and walletconnect initial setup

* fix: Issues with sending, fetching transactions history, almost wrapping up walletconnect

* fix: Adjust imports that would affect monerocom building successfully

* fix: Refine transaction direction and continue work on walletconnect

* feat: Display SPL token transfers in the transaction history and finally settle the transaction direction

* fix: Delay in transactions history dispaly, show native token transactions first, then process spl token transactions

* feat: Switch node and revert solana chain id to previous id

* fix: Remove print statement

* fix: Remove await for transactions, fetch all transaction histories instantly and adjust solana send success message

* chore: Code refactoring and streamlined wallet type check for solana send success message

* fix: Make timeout error for node silent and add spl token images

---------

Signed-off-by: Blazebrain <davidadegoke16@gmail.com>
Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
2024-02-23 15:39:19 +02:00
OmarHatem
21c8d9c16d Merge branch 'v4.13.1_v1.10.1' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	lib/di.dart
	lib/entities/default_settings_migration.dart
2024-01-28 05:04:56 +02:00
Omar Hatem
89fdc0f4d1
Generic fixes (#1274)
* Display fees currency as wallet currency not the selected one

* remove unused code
catch balance network issues

* pop send screen when send completes successfully

* revert change [skip ci]

* Enable restoring haven wallets

* verify context is mounted before showing snackbar [skip ci]

* Update privacy [skip ci]

* Add user consent popup to inapp webview permission request
2024-01-27 00:51:21 +02:00
Matthew Fosse
d664f0a16f
Cw 540 encrypt shared (#1269)
* start writing migration

* save

* finishing up migration

* more fixes

* fixes

* migration fixes

* remove commented code and ensure widget initialization in root.dart

* use securekey static functions everywhere applicable
2024-01-23 02:30:16 +02:00
OmarHatem
851d22fd33 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	.gitignore
	cw_haven/pubspec.lock
	cw_nano/lib/nano_wallet.dart
	cw_nano/pubspec.lock
	lib/buy/moonpay/moonpay_provider.dart
	lib/di.dart
	lib/entities/load_current_wallet.dart
2024-01-16 02:11:28 +02:00
Omar Hatem
133fa2987a
Generic fixes (#1245)
* Remove error message if buy action is disabled

* Fix wallet list selected wallet issue

* Check if the widget is still mounted before showing popup

* minor code readability enhancement [skip ci]

* Code enhancement [skip ci]

* Revert removing ask each time localization

* Add Moonpay to sell flow
Code Enhancements

* remove error popup when sell option is disabled
2024-01-01 15:05:37 +02:00
Serhii
3522561cfc info page refactoring 2023-12-30 21:55:17 +02:00
Serhii
a5895e8832 Merge branch 'main' into CW-529-Modify-2FA-introduction-screens 2023-12-30 16:58:46 +02:00
Serhii
914565eb72
CW-539-DFX-off-ramp-sell-provider (#1229)
* buy_provider_types refactoring

* refactor MoonPay and  sell option flow

* dfx sell flow

* add default sell provider flow

* localization

* Update other_settings_page.dart

* [skip ci] update localization

* [skip ci] providers fixes

* [skip ci] ui fixes

* refactor sell and buy flow

* handle dfx availability by country

* PR fixes
2023-12-28 21:20:59 +02:00
Adegoke David
92914a8532
fix: Fix walletconnect connecting only with the first wallet (#1247) 2023-12-28 03:37:36 +02:00
Omar Hatem
be285e7ebf
V4.12.0 v1.9.0 (#1236)
* update app versions and release notes

* update build number

* Fix balance page tabs UI on white screens [skip ci]

* Vulnerable btc seeds (#1238)

* Add flow to notify users with vulnerable seeds

* - Show vulnerable wallets warning on every app launch
- Change text

* increment build number

* add seeds sha text [skip ci]
2023-12-19 15:16:15 +02:00
OmarHatem
f747773f3a Merge branch 'v4.12.0_v1.9.0' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	assets/text/Monerocom_Release_Notes.txt
	assets/text/Release_Notes.txt
	cw_bitcoin/pubspec.lock
	cw_core/lib/node.dart
	cw_core/pubspec.lock
	cw_core/pubspec.yaml
	cw_ethereum/lib/ethereum_wallet.dart
	cw_monero/example/pubspec.lock
	cw_monero/ios/Classes/monero_api.cpp
	cw_monero/pubspec.lock
	cw_polygon/lib/polygon_wallet.dart
	lib/di.dart
	lib/router.dart
	lib/src/screens/restore/wallet_restore_from_seed_form.dart
	lib/src/screens/wallet_list/wallet_list_page.dart
	lib/store/settings_store.dart
	scripts/android/app_env.sh
	scripts/android/pubspec_gen.sh
	scripts/ios/app_env.sh
	scripts/macos/app_env.sh
2023-12-19 00:25:15 +02:00
Omar Hatem
01e2a84809
Vulnerable btc seeds (#1238)
* Add flow to notify users with vulnerable seeds

* - Show vulnerable wallets warning on every app launch
- Change text

* increment build number

* add seeds sha text [skip ci]
2023-12-19 00:05:27 +02:00
Serhii
9a716d1dc9 Merge branch 'main' into CW-529-Modify-2FA-introduction-screens 2023-12-13 17:44:42 +02:00
Adegoke David
ef7762eaca
Polygon-Wallet-fixes (#1222)
* fix: Fix issues surrounding polygon release

* Add polygon generation command to pubspec script

* Remove unnecesary cast

* fix: Remove unneeded code

* fix: Adjust workflow file to pick polygonScan apikey

* fix: Issues noticed while testing

* fix: Issues noticed while testing

* fix: Transaction should reflect the token name

* fix: Remove unused import

* feat: Add alchemy node to default migration settings

* Fix sending Polygon delay
Remove alchemy node
Minor Enhancements

* Remove scrolling from multiple choices settings row and make them fill the whole space [skip ci]

* Add USDT poly
Add icon for USDC.e

* Fix ERC20 tokens overriding old wallets
Add USDC.e to exchange

* - Remove unnecessary code
- Minor Enhancements

---------

Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
2023-12-13 16:03:07 +02:00
Serhii
50299e60f0 Merge branch 'main' into CW-529-Modify-2FA-introduction-screens 2023-12-13 14:44:38 +02:00
Konstantin Ullrich
72777fbf2c
Cw 534 monero wallet generic enhancements (#1225)
* Fix word count for polyseed on pre_seed_page

* Fix naming of advanced setting

* Set default Seed Type to Polyseed and disable bg-sync by default

* Fix inconsistency between seed type field in restore screen and the one in advanced settings

* Use pub.dev release of polyseed

* Add Legacy Seed to wallet_keys-Page in case of Polyseed
2023-12-09 03:37:39 +02:00
Serhii
2138c35e38
CW-532-DFX-buy-provider (#1209)
* dfx buy provider ui

* fix signing flow

* fixed provider determination based on wallet type and app settings

* update localization files

* minor fix

* Fix BTC, LTC und BCH signMessages

* Add signMessage to monero

* open dfx in webview

* Update dfx_buy_provider.dart

* Revert merge conflict

* Update bitcoin_flutter ref

---------

Co-authored-by: Konstantin Ullrich <konstantinullrich12@gmail.com>
2023-12-08 16:05:52 +02:00
OmarHatem
6eb0706b77 Merge branch 'v4.11.0_v1.8.0' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	cw_bitcoin/lib/electrum_transaction_history.dart
	cw_bitcoin/lib/electrum_wallet_snapshot.dart
	cw_bitcoin/lib/file.dart
	cw_core/lib/file.dart
	cw_core/lib/utils/file.dart
	lib/di.dart
	lib/src/screens/restore/wallet_restore_from_seed_form.dart
	lib/view_model/wallet_new_vm.dart
	model_generator.sh
	tool/configure.dart
2023-12-04 22:55:08 +02:00
Adegoke David
b3d579c24a
CW-527-Add-Polygon-MATIC-Wallet (#1179)
* chore: Initial setup for polygon package

* feat: Add polygon node urls

* feat: Add Polygon(MATIC) wallet WIP

* feat: Add Polygon(MATIC) wallet WIP

* feat: Add Polygon MATIC wallet [skip ci]

* fix: Issue with create/restore wallet for polygon

* feat: Add erc20 tokens for polygon

* feat: Adding Polygon MATIC Wallet

* fix: Add build command for polygon to workflow file to fix failing action

* fix: Switch evm to not display additional balance

* chore: Sync with remote

* fix: Revert change to inject app script

* feat: Add polygon erc20 tokens

* feat: Increase migration version

* fix: Restore from QR address validator fix

* fix: Adjust wallet connect connection flow to adapt to wallet type

* fix: Make wallet fetch nfts based on the current wallet type

* fix: Make wallet fetch nfts based on the current wallet type

* fix: Try fetching transactions with moralis

* fix: Requested review changes

* fix: Error creating new wallet

* fix: Revert script

* fix: Exclude spam NFTs from nft listing API response

* Update default_erc20_tokens.dart

* replace matic with matic poly

* Add polygon wallet scheme to app links

* style: reformat default_settings_migration.dart 

* minor enhancement 

* fix using different wallet function for setting the transaction priorities 

* fix: Add chain to calls

* Add USDC.e to initial coins

* Add other default polygon node 

* Use Polygon scan
some UI fixes

* Add polygon scan api key to secrets generation code

---------

Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
2023-12-02 04:26:43 +02:00
OmarHatem
2c03f858bc fix conflicts with main 2023-11-27 17:44:40 +02:00
OmarHatem
7b20ff0223 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	cw_monero/ios/Classes/monero_api.cpp
	ios/Podfile.lock
	lib/router.dart
	lib/src/screens/restore/wallet_restore_from_seed_form.dart
	lib/src/screens/restore/wallet_restore_page.dart
	lib/store/settings_store.dart
	lib/view_model/wallet_new_vm.dart
	scripts/android/app_env.sh
	tool/configure.dart
2023-11-27 17:36:58 +02:00
Serhii
7f5ccf5336 Merge branch 'main' into CW-529-Modify-2FA-introduction-screens 2023-11-24 07:53:20 +02:00
Serhii
b87c11bbe4 fix 2fa UI 2023-11-23 16:51:22 +02:00
Serhii
217c19272f pre seed page refactoring 2023-11-22 23:37:05 +02:00
Adegoke David
0c77b23ecb
feat: Implement NFT Tab for Eth (#1166)
* feat: Implement NFT Listing and Importing of new NFTs, also display NFTs linked to the wallet address

* Adjust UI based on wallet type, display nfts only when an ethereum wallet

* fix: Prevent tab bar from scrolling

* feat:Add NFT tab: adjust models and add localization

* feat:Add NFT tab: adjust models and add localization

* chore: Remove unused widget

* fix: Adjust UI to reflect more data, display image based on type, either png or svg, adjust theme-a

* fix: Update viewmodel

* fix: Add missing dependency to fix failing CI

* fix: Revert change in inject app script

* Delete cw_polygon/pubspec.lock

* - Code enhancements
- UI fixes
- Removing unrelated files

---------

Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
2023-11-22 19:43:26 +02:00
OmarHatem
6f7da06617 Merge branch 'v4.10.5_v1.7.5' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	cw_bitcoin/pubspec.lock
	cw_core/pubspec.lock
	cw_core/pubspec.yaml
	cw_haven/pubspec.lock
	cw_monero/example/pubspec.lock
	cw_monero/pubspec.lock
	cw_nano/pubspec.lock
2023-11-18 17:09:02 +02:00
Omar Hatem
ab83f5b67f
Cw 519 tor connection (#1158)
* initial draft for tor feature

* Configure nodes to use Tor proxy if enabled

* Add socks proxy upon connecting to tor
fix disconnect button

* Try tor with github actions

* accept defaults for rust installation

* Merge main
Change Tor tile name
2023-11-18 15:43:15 +02:00
OmarHatem
06fd8b640c Merge branch 'v4.10.5_v1.7.5' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	.github/workflows/pr_test_build.yml
	cw_bitcoin/lib/electrum_wallet.dart
	cw_monero/ios/Classes/monero_api.cpp
	cw_monero/lib/monero_wallet.dart
	lib/core/auth_service.dart
	lib/core/backup_service.dart
	lib/core/wallet_creation_service.dart
	lib/di.dart
	lib/ionia/ionia_service.dart
	lib/store/settings_store.dart
	macos/Flutter/GeneratedPluginRegistrant.swift
	pubspec_base.yaml
2023-11-18 03:48:28 +02:00
Matthew Fosse
f4e71c72ef
Nano rep fixes (#1145)
* add preference keys for default nano/banano rep

* updates to change rep page, add success message

* forgot to save this file

* nano_client cleanup

* first pass

* refactor to use sharedprefs in nano_client

* review fixes
2023-11-17 20:35:46 +02:00
Serhii
8237b89d56
CW-520-Enable-user-to-choose-12-or-24-seed-words-for-BCH-and-ETH (#1181)
* seed phrase option UI

* bch seed length option

* eth seed lengh option

* update preseed info

* update localization files
2023-11-17 15:45:42 +02:00
Serhii
36361ef329
CW-526-Add-Trocador-providers-option-in-privacy-settings (#1177)
* Trocador settings page UI

* add trocador providers states

* add settings icon

* minor fix

* Revert "minor fix"

This reverts commit e59d9dfdaf.

* fixes

* PR fixes

* remove trocador menu icon
2023-11-17 01:23:34 +02:00
OmarHatem
c9c7671c81 Merge branch 'main' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	assets/text/Monerocom_Release_Notes.txt
	assets/text/Release_Notes.txt
	cw_monero/lib/monero_wallet.dart
	lib/entities/default_settings_migration.dart
	lib/router.dart
	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_ha.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_tl.arb
	res/values/strings_tr.arb
	res/values/strings_uk.arb
	res/values/strings_ur.arb
	res/values/strings_yo.arb
	res/values/strings_zh.arb
	scripts/android/app_env.sh
	scripts/ios/app_env.sh
	scripts/macos/app_env.sh
2023-11-05 01:44:13 +03:00
Serhii
ca6ccf1cf9
CW-506-Add-a-switch-to-enable-disable-domain-lookups (#1155)
* looks up domain ui

* update address resolv func

* add localization

* minor fixes

* Revert "Merge branch 'main' into CW-506-Add-a-switch-to-enable-disable-domain-lookups"

This reverts commit 92924a90e8, reversing
changes made to 5a2a203054.

* Revert "Revert "Merge branch 'main' into CW-506-Add-a-switch-to-enable-disable-domain-lookups""

This reverts commit 00cf6a1cad.

* fix merge commit
2023-11-03 21:23:11 +02:00
Serhii
2d454e0e48
CW-511-Tablet-iPad-keyboard-issue (#1143)
* fix keyboard issue

* Update responsive_layout_util.dart

* fix close button color

* minor fix

* [skip ci] Update pin_code_widget.dart

* Update main.dart

* fix qr widget overflow issue

* Fix minor UI issue

---------

Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
2023-11-03 07:42:18 +02:00
Adegoke David
745607aa73
CW-515-WalletConnect-deeplink (#1153)
* feat: WalletConnect deeplink WIP

* fix: Handle cases where a non ethereum address is in use when the trigger is made

* fix: edgecases fixes for walletconect

* fix: edgecases fixes for walletconect

* Update pubspec_base.yaml

* remove unused dependency

* remove unused dependency

---------

Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
2023-11-02 16:41:11 +02:00
OmarHatem
abb18bb9fb Remove Flutter Secure Storage from Linux 2023-10-23 17:13:16 +03:00
OmarHatem
ff1efbd15c Merge branch 'v4.10.2_v1.7.2' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	assets/text/Release_Notes.txt
	lib/di.dart
	scripts/android/app_env.sh
	scripts/ios/app_env.sh
	scripts/macos/app_env.sh
2023-10-23 17:01:00 +03:00
Adegoke David
374110db54
Cw 497 wallet connect for desktop (#1134)
* feat: Implement WalletConnect for Desktop

* feat: WalletConnect for Desktop

* fix: Properly handle and dispose textEditingController for URI

* chore: Move BottomSheetListener to Sidebar for desktop app

* Remove unused variable and imports

* Update desktop_settings_page.dart

---------

Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>
2023-10-19 19:25:44 +03:00
Matthew Fosse
98a9edc656
fix nano sending, update restore page wording, and other minor fixes (#1130)
* fix nano sending, update restore page wording, and other minor fixes

* fix bch address parsing

* minor code enhancement [skip ci]

* Register the main secure storage as the long lived instance of secure storage throughout the app session

---------

Co-authored-by: Serhii <borodenko.sv@gmail.com>
Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
2023-10-17 18:59:41 +03:00
OmarHatem
9101165921 Merge branch 'v4.10.1_v1.7.1' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password
 Conflicts:
	cw_bitcoin/lib/electrum_wallet.dart
	lib/di.dart
	lib/main.dart
	lib/view_model/wallet_new_vm.dart
	model_generator.sh
	tool/configure.dart
2023-10-13 17:29:46 +03:00