Commit graph

4075 commits

Author SHA1 Message Date
julian
526025f0f0 ensure refs are pointing to main 2023-07-27 07:59:50 -06:00
julian
a194594b4d Merge remote-tracking branch 'origin_SW/staging' into add-xlm 2023-07-27 07:57:58 -06:00
julian-CStack
617fbf9589
Merge pull request #629 from cypherstack/ui-fixes
tweaks
2023-07-27 07:49:35 -06:00
likho
3b5cea8ee1 Fix submodule url for libmonero 2023-07-27 15:34:08 +02:00
likho
c73e41b2cb Resolved conflicts with flutterlibmonero 2023-07-27 15:28:33 +02:00
likho
bce20eab32 Resolve merge conflicts 2023-07-27 15:05:27 +02:00
likho
a21781a33b Update price tests to include Stellar 2023-07-27 14:54:42 +02:00
likho
e8b91c5287 Update testnet block explorer 2023-07-27 13:20:19 +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
f51cf2e395 extra temp check on firo 2023-07-26 17:15:11 -06:00
julian-CStack
920206e1f1
Merge pull request #624 from cypherstack/ordinals
Litecoin Ordinals
2023-07-26 17:08:35 -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
e520726495 fix the fix 2023-07-26 16:51:01 -06:00
julian-CStack
d4c90629c3
Merge pull request #628 from cypherstack/add-monkey
Add MonKey to banano
2023-07-26 16:32:56 -06:00
julian
f27e818d97 Merge remote-tracking branch 'origin_SW/staging' into add-monkey 2023-07-26 16:29:32 -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
sneurlax
7c696f1a0c fix desktop fusion view 2023-07-26 17:21:18 -05:00
julian
d8e6f3cac6 fix mobile nav error 2023-07-26 16:15:29 -06:00
sneurlax
fe707ac381 "Bitcoin"->"Bitcoin Cash" 2023-07-26 17:12:46 -05: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
sneurlax
19a968472b move CashFusion fuse() demo into FusionInterface 2023-07-26 17:08:29 -05: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
6e9d8b26d0 add DesktopCashFusionView 2023-07-26 17:07:39 -05:00
sneurlax
d3832a56b5 add CashFusionView 2023-07-26 17:07:06 -05:00
sneurlax
1a0d47d5c7 add placeholder asset
robothead
2023-07-26 17:06:36 -05:00
sneurlax
04f0049710 add hasFusionSupport bool 2023-07-26 17:06:17 -05:00
sneurlax
d71ca45657 add fusion interface as mixin 2023-07-26 17:06:02 -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
julian
80dad5156a Merge remote-tracking branch 'origin_SW/ui-fixes' into ordinals
# Conflicts:
#	lib/db/isar/main_db.dart
2023-07-26 15:11:03 -06:00
ryleedavis
66e1db9b52 WIP: scaling monkey view for desktop 2023-07-26 15:10:53 -06:00
julian
36747ca479 another bandaid fix for hive box isn't open 2023-07-26 14:50:38 -06:00
sneurlax
5cd8b4864e Merge remote-tracking branch 'origin/staging' into fusion 2023-07-26 15:31:28 -05:00
julian-CStack
13e08acf06
Merge pull request #626 from cypherstack/firo_clean_up
Firo clean up and fixes
2023-07-26 14:26:39 -06:00
ryleedavis
5668b045e5 WIP: adding monkey to desktop 2023-07-26 14:12:19 -06:00
ryleedavis
3cb8a6a173 WIP: adding monkey to desktop 2023-07-26 14:12:06 -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
Jonald Fyookball
6c0dbfbde8 Push local changes to branch. 2023-07-26 14:07:30 -04:00
ryleedavis
032061fa19 changed generate monkey structure 2023-07-26 12:03:01 -06:00
sneurlax
ba4e83968d show more button on desktop wallet home page if wallet ordinalsinterface 2023-07-26 13:02:56 -05:00
julian
dbcb567d6b fix tests 2023-07-26 11:54:46 -06:00