Commit graph

1447 commits

Author SHA1 Message Date
likho
2732b2fe71 WIP: XLM fixes and refactor 2023-08-22 18:33:24 +02:00
sneurlax
f2af2b10bd Revert "Merge branch 'tor' into tor-presocks"
This reverts commit 75750e2bd1.
2023-08-15 22:10:41 -05:00
sneurlax
8c47456077 Merge remote-tracking branch 'origin/staging' into fusion 2023-08-14 12:31:45 -05:00
Diego Salazar
b6aa7a974a
Merge pull request #647 from cypherstack/ui-fixes
clear electrumx cache option for firo wallets
2023-08-14 11:27:51 -06:00
julian
0d701a51b7 clear electrumx cache option for firo wallets 2023-08-14 09:21:27 -06:00
likho
3c05c568eb Merge branch 'staging' into add-xtz 2023-08-07 17:13:55 +02:00
likho
ea47e41d90 Allow cancelling incoming txs for Epiccash 2023-08-02 13:30:06 +02:00
Josh Babb
10eb56ef43 Merge remote-tracking branch 'origin/staging' into fusion 2023-08-01 11:01:11 -05:00
Likho
6a750c9356
Merge branch 'staging' into fix-desktop-onchain-notes 2023-07-31 15:00:51 +02:00
likho
ff944928b6 fix: Onchain notes missing for desktop 2023-07-31 12:16:08 +02:00
detherminal
a1ef84fbe6 fix stellarTestNet and dependency problems 2023-07-28 23:00:14 +03:00
julian
64d946e752 apply lelantus rescan on desktop 2023-07-28 13:53:14 -06:00
julian
8c91e0f3b8 WIP mobile one time firo rescan 2023-07-28 13:10:57 -06:00
julian
92f19de43c WIP one time firo rescan 2023-07-28 10:55:04 -06:00
ryleedavis
724f6193d7 merge conflicts 2023-07-28 10:50:05 -06:00
ryleedavis
b66b25eb1f Merge branch 'staging' into add-xtz
# Conflicts:
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
#	lib/services/coins/coin_service.dart
#	lib/services/price.dart
#	lib/utilities/amount/amount_unit.dart
#	lib/utilities/block_explorers.dart
#	lib/utilities/constants.dart
#	lib/utilities/default_nodes.dart
#	lib/utilities/enums/coin_enum.dart
#	lib/utilities/enums/derive_path_type_enum.dart
#	lib/widgets/node_card.dart
#	lib/widgets/node_options_sheet.dart
#	pubspec.yaml
2023-07-28 10:48:52 -06:00
julian
cf03526d45 Merge remote-tracking branch 'origin_SW/staging' into fusion
# Conflicts:
#	lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart
2023-07-27 15:48:11 -06:00
julian
a6a7b53837 show file path on image save 2023-07-27 15:42:58 -06:00
ryleedavis
8b8ce89ced Monkey option only shows for banano wallets 2023-07-27 14:08:08 -06:00
sneurlax
9b4c1abf35 Merge remote-tracking branch 'origin/staging' into fusion 2023-07-27 12:03:55 -05:00
ryleedavis
197d760102 Merge branch 'staging' into add-xtz
# Conflicts:
#	pubspec.lock
2023-07-27 10:45:41 -06:00
julian
4281fa5d33 Merge remote-tracking branch 'origin_SW/staging' into ui-fixes 2023-07-27 10:43:49 -06:00
julian
7ca6da60f9 clean up mobile ordinal details view 2023-07-27 10:33:59 -06:00
julian
e93ecad744 save ordinal image to file 2023-07-27 10:26:52 -06:00
julian
6ccd7a76a5 desktop clean up 2023-07-27 09:47:50 -06:00
sneurlax
87f12d9c3c Merge remote-tracking branch 'origin/staging' into fusion 2023-07-27 10:33:03 -05:00
julian
8b88890e05 refactor network call into mockable provider and handle errors 2023-07-27 09:28:01 -06:00
julian
a194594b4d Merge remote-tracking branch 'origin_SW/staging' into add-xlm 2023-07-27 07:57:58 -06:00
likho
bce20eab32 Resolve merge conflicts 2023-07-27 15:05:27 +02:00
likho
7061c3c40b Add testnet to coin list 2023-07-27 13:09:56 +02:00
julian
703863cab8 reorder firo balance sheet on mobile 2023-07-26 17:21:36 -06:00
julian
46e0258737 Merge remote-tracking branch 'origin_SW/staging' into ordinals
# Conflicts:
#	lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart
#	lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/more_features/more_features_dialog.dart
#	pubspec.yaml
2023-07-26 17:05:33 -06:00
julian
4d87096324 temp disable some ordinals stuff 2023-07-26 17:01:24 -06:00
julian
7390c498c7 set state on download 2023-07-26 16:29:09 -06:00
ryleedavis
04b9cddb19 fixed path 2023-07-26 16:23:34 -06:00
ryleedavis
8754142694 android file path 2023-07-26 16:21:20 -06:00
julian
d8e6f3cac6 fix mobile nav error 2023-07-26 16:15:29 -06:00
julian
2f5a18b615 merge conflict clean things 2023-07-26 16:10:27 -06:00
julian
bf309d4902 Merge remote-tracking branch 'origin_SW/add-monkey' into add-monkey
# Conflicts:
#	lib/pages/monkey/monkey_view.dart
2023-07-26 16:09:10 -06:00
julian
9d2b315bd9 desktop layout 2023-07-26 16:08:01 -06:00
sneurlax
4e134664e7 show CashFusion option in wallet More dialog 2023-07-26 17:07:56 -05:00
ryleedavis
39882b0d46 monkey icon in app bar 2023-07-26 16:07:54 -06:00
sneurlax
d3832a56b5 add CashFusionView 2023-07-26 17:07:06 -05:00
julian
0175939d63 download/save image on linux 2023-07-26 15:52:52 -06:00
ryleedavis
4e9ba50572 Desktop what is monkey button 2023-07-26 15:37:10 -06:00
julian
b2aa4272b4 reorg and loading indicator 2023-07-26 15:32:00 -06:00
ryleedavis
66e1db9b52 WIP: scaling monkey view for desktop 2023-07-26 15:10:53 -06:00
ryleedavis
86d3258910 Monkey help message 2023-07-26 13:18:18 -06:00
ryleedavis
ea9f997d0b Merge branch 'staging' into add-monkey
# Conflicts:
#	lib/services/coins/banano/banano_wallet.dart
2023-07-26 12:07:36 -06:00
ryleedavis
032061fa19 changed generate monkey structure 2023-07-26 12:03:01 -06:00
ryleedavis
2eb10e249f add monkey image to hive and display on wallet card 2023-07-26 11:54:10 -06:00
ryleedavis
683364750a structure change to add monkey image 2023-07-26 11:13:48 -06:00
ryleedavis
78e4cd4631 removed unnecessary lines 2023-07-25 17:42:36 -06:00
ryleedavis
512960d9b9 changed monkey files around 2023-07-25 17:29:05 -06:00
ryleedavis
c6c2b42923 monkey.svg download to user device 2023-07-25 17:06:32 -06:00
ryleedavis
b2ec2763fb monkey.png downloads to user device 2023-07-25 16:51:21 -06:00
ryleedavis
3cbde8b5c1 able to download monkey.png 2023-07-25 14:52:58 -06:00
ryleedavis
a286ba7b8f monkey view page 2023-07-24 12:43:33 -06:00
sneurlax
8e5f2d190d temporarily disable send button 2023-07-22 21:50:49 -05:00
sneurlax
58c3bdbf2b don't flash red on load 2023-07-22 21:50:29 -05:00
detherminal
e0df4723ae feat: add xlm 2023-07-22 10:21:04 +02:00
julian
e559ee1cc5 WIP desktop ordinal details view 2023-07-21 19:52:43 -06:00
julian
6c6c9c8325 desktop ordinals in wrap 2023-07-21 19:15:26 -06:00
julian
c2df7ea113 wip desktop ordinals list 2023-07-21 19:06:01 -06:00
julian
dffa33abd3 load ordinals into isar as a cache and backend view model 2023-07-21 18:43:59 -06:00
julian
48109f3c49 use isar ordinal model 2023-07-21 18:18:26 -06:00
julian
b3e4d63a89 strongly typed spacing 2023-07-21 18:17:59 -06:00
sneurlax
f478f0e9ec Merge branch 'ordinals-desktop' into ordinals 2023-07-21 19:13:35 -05:00
sneurlax
c7d114e268 remove nested AspectRatio 2023-07-21 19:11:33 -05:00
ryleedavis
8ac085fe24 fix monkey icon 2023-07-21 18:01:38 -06:00
ryleedavis
ee5a97c2fb add monkey icon 2023-07-21 17:59:01 -06:00
ryleedavis
fb39e96308 WIP: monkey view + fetching monkey dialog 2023-07-21 17:56:01 -06:00
julian
fe41bce563 disable collection type in ord filter 2023-07-21 17:24:20 -06:00
julian
051fc7d1ef Merge remote-tracking branch 'origin_SW/staging' into ordinals 2023-07-21 17:18:18 -06:00
julian
8a0a45f131 mobile rep fix 2023-07-21 16:09:47 -06:00
julian
3125a25a69 add change rep to desktop 2023-07-21 15:58:28 -06:00
sneurlax
5a845f8669 hide certain fields on ordinals views, change ordinal card aspect ratio 2023-07-21 16:35:00 -05:00
julian
9369ae15ec Merge remote-tracking branch 'origin_SW/staging' into nano_rep_change 2023-07-21 14:25:05 -06:00
julian
e7b480e585 add ba/nano wallet representative change option to wallet settings, remove coin control from ba/nano, and some other clean up 2023-07-21 14:11:30 -06:00
ryleedavis
1adc5f23a4 Merge branch 'staging' into chan-cards
# Conflicts:
#	lib/models/isar/stack_theme.dart
#	lib/models/isar/stack_theme.g.dart
2023-07-21 11:09:44 -06:00
sneurlax
f46a37d4d4 convert/map/cast InscriptionData->Ordinal 2023-07-21 11:48:31 -05:00
sneurlax
ddba1c54f7 show ordinal image 2023-07-21 10:49:30 -05:00
sneurlax
65e8c34e34 hook up details view to OrdinalsInterface 2023-07-21 10:43:02 -05:00
sneurlax
f750bbfe10 hook OrdinalsList up to OrdinalsInterface 2023-07-21 10:30:47 -05:00
sneurlax
c295ca9a6f fix ordinal view crash 2023-07-21 10:12:31 -05:00
ryleedavis
0ce86ce7fe Chan card images for favorites and wallet 2023-07-20 16:51:37 -06:00
sneurlax
20fdcf4817 refactor manager var out to _manager, comment update 2023-07-20 17:15:25 -05:00
julian
24d443886e hide empty tx note field on mobile confirm send screen 2023-07-20 16:04:01 -06:00
sneurlax
b773811eac working proof of concept 2023-07-20 16:49:26 -05:00
sneurlax
4db0328c73 WIP _db not initialized, refresh on ordinals view for poc 2023-07-20 16:30:39 -05:00
ryleedavis
480f637670 WIP: added cardFavoriteImages + check if card should be favorites or wallet 2023-07-20 15:15:03 -06:00
julian
8a84c89824 show failed instead of cancelled for eth failed txns 2023-07-20 15:13:56 -06:00
sneurlax
ca8e930904 move demo into refresh button, add refreshInscriptions() stub w prev poc 2023-07-20 15:32:39 -05:00
sneurlax
4be7919e46 expand upon demo
TODO remove WIP, hook directly into StreamBuilder
2023-07-20 14:53:20 -05:00
sneurlax
f046912c89 litescribe api and demo 2023-07-20 14:53:09 -05:00
sneurlax
d02b7f7ad4 formatting and model updates 2023-07-20 14:05:51 -05:00
sneurlax
0284bb2951 use https api, implement other methods 2023-07-19 17:13:54 -05:00
sneurlax
2de8ffe593 add test button 2023-07-19 15:58:34 -05:00
julian
895903b9ca Merge branch 'ui-fixes' into ordinals 2023-07-19 11:03:29 -06:00
julian-CStack
f2a872c44c ensure cursor stays at end on exchange/swap form 2023-07-19 08:54:56 -06:00
julian-CStack
d867270aac exchange view amount string provider fix 2023-07-19 08:42:06 -06:00
likho
45af21dc27 Fix merge conflicts with staging 2023-07-19 16:37:54 +02:00
detherminal
0ae747aebc feat: add xtz 2023-07-19 16:19:48 +02:00
julian
5b4a803215 add ordinals icon 2023-07-18 11:51:57 -06:00
julian
2af1a8db88 ordinals filter view 2023-07-18 11:48:15 -06:00
julian
8b71fa70c9 added a couple dialogs 2023-07-18 11:26:43 -06:00
julian
79670c5d47 WIP ordinal details view 2023-07-18 11:03:57 -06:00
julian
58c97de86c WIP ordinal ui 2023-07-18 10:15:05 -06:00
julian-CStack
3273cf0e23 disable new wownero wallet unless platform is android 2023-07-13 16:26:29 -06:00
julian
593680f9f3 auto focus next field on correct seed word entry 2023-07-10 10:05:30 -06:00
julian-CStack
ebf67df3a9
Merge branch 'staging' into add-onchain-notes-for-epic 2023-07-05 11:58:29 -06:00
likho
a750ec0a0a Remove extra condition 2023-07-05 19:58:03 +02:00
likho
1ce64cd157 Fix on chain notes showing for other coins 2023-07-05 18:18:49 +02:00
likho
3ae04b6e5f Fix indentation so Onchain note doesn't show for other coins 2023-07-05 17:31:06 +02:00
likho
71591053f2 Text updates, Update epiccash plugin 2023-07-05 17:19:41 +02:00
likho
ca27f13d7b WIP:Add onchain notes for Epic 2023-07-05 14:57:17 +02:00
julian
d894d60c1e contact address sorting 2023-07-04 17:40:06 -06:00
julian
ab9e734b80 fix: dogecoin custom fee slider and possible absurd fees error 2023-07-04 10:25:13 -06:00
julian
87ed25bd5b use relative path for theme assets 2023-07-03 18:25:18 -06:00
julian
9513b203a9 refactor delete hive boxes in prep for hive->isar migration 2023-07-03 13:58:11 -06:00
julian
011ba6bf61 use theme brightness for simplex logo 2023-07-01 15:06:49 -06:00
julian
b64b5cdb9b fix: use proper uri builder function 2023-06-23 15:27:09 -06:00
julian
f60dee0304 Merge remote-tracking branch 'origin_SW/staging' into custom_fee_selection 2023-06-19 10:09:16 -06:00
julian
fae0c778ef feat: WIP desktop custom fee selection for supported coins 2023-06-19 10:04:25 -06:00
julian
0778deb6d3 feat: custom fee for sends on mobile for supported coins 2023-06-17 10:42:23 -06:00
julian
833daea120 hide fee selection for ba/nano send 2023-06-16 18:32:56 -06:00
julian
61e074e3cd Merge remote-tracking branch 'origin_SW/staging' into amount_separators 2023-06-16 17:13:28 -06:00
julian
346a6a7a01 account for units setting 2023-06-16 17:04:39 -06:00
julian
c0eb85ce5a insert and handle localised group and decimal separators in textfield amounts 2023-06-16 16:47:03 -06:00
julian
f88d7f200c fiat amount string formatting and parsing and more WIP usages thereof 2023-06-16 13:42:37 -06:00
julian
bc0c9168b5 fix: coin card chan aspect ratio 2023-06-15 17:47:58 -06:00
julian
a3dcdf6fcd fix: no fees for (ba)nano 2023-06-08 14:00:31 -06:00
julian
89c28a2d9d re enable git versions 2023-06-08 13:24:35 -06:00
julian
f3c366a25d fix: firo trade send from stack with public balance broadcast tx fix 2023-06-08 13:14:10 -06:00
julian
338e354e4b fix: shift fix for amounts when set to lowest unit value (ex sats for btc) 2023-06-08 11:58:26 -06:00
julian
ed120f552a Merge branch 'ba_nano_fixes' into ui-fixes 2023-06-08 11:03:50 -06:00
julian
d69b21b4a8 create single coin card widget 2023-06-08 10:59:44 -06:00
julian
91fb2598c4 fix: do not show fees on (ba)nano tx details screen 2023-06-08 09:11:43 -06:00
julian
4874ef5a63 disable address generate button for (ba)nano 2023-06-08 09:03:32 -06:00
julian
81970af4a4 correct mnemonic length displayed on new ba/nano wallet creation 2023-06-08 08:54:29 -06:00
julian
cd1736ffa6 png fix 2023-06-07 16:05:49 -06:00
julian
440235b6de WIP: add fav card chan images 2023-06-07 16:02:32 -06:00
ryleedavis
f7a59d140f Merge branch 'staging' into ui-fixes 2023-06-07 15:18:57 -06:00
julian
35843e5e62 small changes 2023-06-07 14:57:15 -06:00
ryleedavis
8d823dc2e3 WIP: chan cards 2023-06-07 14:34:27 -06:00
julian
b6ed690eb6 fix: default coin units length and banano unit names 2023-06-07 13:17:49 -06:00
julian
d627f8e73c fix: animation duration/period not set before calling repeat 2023-06-07 09:02:22 -06:00
julian
05832287e7 disable openalias 2023-06-07 07:36:54 -06:00
julian
a353ab341a Merge remote-tracking branch 'origin_SW/staging' into flutter_upgrade
# Conflicts:
#	crypto_plugins/flutter_libmonero
2023-06-05 16:26:28 -06:00
julian
117007180e fix: missing coin cases 2023-06-05 14:55:41 -06:00
julian
b92fb5b547 Merge remote-tracking branch 'origin_SW/add_nano' into flutter_upgrade
# Conflicts:
#	pubspec.lock
2023-06-05 14:48:03 -06:00
julian-CStack
58b8509b41
Merge pull request #569 from fossephate/add-nano
Banano support
2023-06-05 14:07:14 -06:00
julian
044c957152 refactor dropdown2 and qr image 2023-06-05 07:40:56 -06:00
fossephate
3c524b2ea4 add banano support 2023-05-30 19:19:31 -04:00
julian
774bfe517e fix: missing eth case 2023-05-30 10:38:47 -06:00
julian
243994ff45 fix: missing eCash case 2023-05-30 10:31:49 -06:00
julian
1449814e35 Merge branch 'amount_display_precision' into add_nano
# Conflicts:
#	lib/pages/pinpad_views/create_pin_view.dart
#	lib/widgets/custom_pin_put/custom_pin_put_state.dart
2023-05-30 09:11:41 -06:00
julian
79a22e12c3 Merge remote-tracking branch 'origin_SW/staging' into amount_display_precision 2023-05-30 09:04:34 -06:00
julian
388c60d016 fix: various amount unit issues 2023-05-30 09:02:09 -06:00
julian
452110c221 feat: desktop coin units gui 2023-05-30 07:44:49 -06:00
julian
f2fd998148 Merge remote-tracking branch 'origin_SW/staging' into windows
# Conflicts:
#	lib/main.dart
2023-05-29 17:57:26 -06:00
julian
8155e4afd4 fix: duplicate units displayed 2023-05-29 16:53:22 -06:00
julian
528bc7405c feat: mobile amount unit selection ui 2023-05-29 16:50:21 -06:00
julian
7484353854 Merge remote-tracking branch 'origin_SW/staging' into persistence
# Conflicts:
#	test/electrumx_test.mocks.dart
2023-05-29 16:24:25 -06:00
julian
1b1c61a3a3 feat: WIP use amount formatter in GUI 2023-05-29 15:11:48 -06:00
julian
838e623ff2 fix: update fiat price on fiat currency selection changed 2023-05-29 10:39:14 -06:00
likho
83778bb121 Fix Epiccash caching issue, add additional status messages as in Epicpay 2023-05-28 14:57:05 +02:00
detherminal
95a0309b8b docs: add header to source code again 2023-05-27 00:21:16 +03:00
detherminal
ccf5e68fc6 Revert "docs: add copyright header to all source code"
This reverts commit 84ac798bb8.
2023-05-27 00:19:24 +03:00
detherminal
a347ddffc4 feat: add openalias support for xmr 2023-05-27 00:17:09 +03:00
detherminal
84ac798bb8 docs: add copyright header to all source code 2023-05-26 19:33:04 +03:00
Rylee Davis
60294e0144
Custom pin length (#555)
* WIP: pinCount stuff

* pin decoration + and pinCount is 0

* pin length tweaks

* fixes error when backspacing pin + add icon to flushbar

* removed Constants.pinLength + changes to "change pin" setting

* testing pin output

* WIP: tests pass + commented out isRandom pin 1234

* removed pin output

---------

Co-authored-by: ryleedavis <rylee@cypherstack.com>
Co-authored-by: julian <julian@cypherstack.com>
2023-05-26 09:45:45 -06:00
julian
3189203419 fix: Firo total displayed on favourite card 2023-05-25 10:05:20 -06:00
julian
553e035ca7 Merge remote-tracking branch 'origin_SW/staging' into add_nano
# Conflicts:
#	lib/models/isar/stack_theme.dart
#	lib/models/isar/stack_theme.g.dart
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
#	lib/services/coins/firo/firo_wallet.dart
#	lib/themes/coin_icon_provider.dart
#	lib/themes/coin_image_provider.dart
#	lib/utilities/constants.dart
#	lib/utilities/enums/coin_enum.dart
2023-05-24 11:37:37 -06:00
julian
0933546806 fix: various eCash tweaks + 0 conf 2023-05-24 11:00:54 -06:00
julian
e7db6739ec disable wownero on linux 2023-05-23 17:47:52 -06:00
julian
206a460cfa fix: update theme button 2023-05-23 17:19:16 -06:00
julian
6065c29e0d add update theme button 2023-05-23 15:13:56 -06:00
julian
ee128810b5 fix debug address details view on desktop 2023-05-23 10:53:06 -06:00
julian
73d877654b add tx subtype to tx details view in debug mode 2023-05-23 09:52:48 -06:00
julian
141c3f34c9 temp fix 2023-05-19 16:58:44 -06:00
julian
523fd96929 Revert "re enable git versions"
This reverts commit ab02950f03.
2023-05-19 16:53:10 -06:00
julian
9d76b60d00 fix: paynym unclaimed asset 2023-05-19 16:44:52 -06:00
julian
ab02950f03 re enable git versions 2023-05-19 16:41:13 -06:00
julian
68fdaeff13 fix: paynym unclaimed asset 2023-05-19 14:11:01 -06:00
julian
64c509c847 Merge remote-tracking branch 'origin_SW/add-ecash' into windows
# Conflicts:
#	lib/pages_desktop_specific/desktop_menu.dart
#	lib/pages_desktop_specific/password/delete_password_warning_view.dart
#	lib/services/coins/bitcoin/bitcoin_wallet.dart
#	lib/services/coins/bitcoincash/bitcoincash_wallet.dart
#	lib/services/coins/dogecoin/dogecoin_wallet.dart
#	lib/services/coins/firo/firo_wallet.dart
#	lib/services/coins/litecoin/litecoin_wallet.dart
#	lib/services/coins/namecoin/namecoin_wallet.dart
#	lib/services/coins/particl/particl_wallet.dart
#	lib/services/locale_service.dart
#	lib/utilities/stack_file_system.dart
#	scripts/setup.sh
2023-05-19 12:54:20 -06:00
julian
6c691e26f5 fix: trocador swap status link 2023-05-19 08:44:15 -06:00
detherminal
8f89f19b91 feat: add nano 2023-05-19 13:20:16 +03:00
julian
1991cdb6b2 add version check for default installed themes and some clean up 2023-05-18 17:00:23 -06:00
julian
b946bba01b v2 theme assets 2023-05-18 12:52:48 -06:00
julian
4f3a2830c5 debug address details info 2023-05-17 15:55:36 -06:00
julian
0d7a0a8fb9 Merge branch 'staging' into add-ecash
# Conflicts:
#	lib/utilities/assets.dart
#	lib/utilities/theme/color_theme.dart
2023-05-17 12:11:08 -06:00
ryleedavis
e463560a5f fix support page icon color 2023-05-16 15:38:18 -06:00
julian
e843065278 fix: contact id access fixes 2023-05-16 09:33:28 -06:00
julian
ba33aee395 fix: token view summary icon asset loading 2023-05-15 16:31:03 -06:00
julian
f6ab07787f Merge remote-tracking branch 'origin_SW/staging' into ui-fixes 2023-05-15 15:34:30 -06:00
julian
63035aabf0 feat: desktop custom block explorers 2023-05-15 15:33:32 -06:00
julian
59c1a49ee7 Merge branch 'ui-fixes' into address_book_isar
# Conflicts:
#	lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart
#	lib/utilities/db_version_migration.dart
2023-05-15 14:15:34 -06:00
julian
52bffbac08 add contacts migration from hive to isar and remove contact class conversion 2023-05-15 14:12:06 -06:00
julian
8351821c89 disable xpubs temporarily 2023-05-15 11:15:35 -06:00