Commit graph

5142 commits

Author SHA1 Message Date
sneurlax
59379faa4c Merge remote-tracking branch 'fyookball/fusion' into fusion 2023-07-27 13:40:08 -05:00
Jonald Fyookball
e91ac3d355 Fixes for registerAndWait. 2023-07-27 14:29:03 -04:00
sneurlax
40d9a8aa9e include exception if non-null 2023-07-27 13:14:19 -05:00
sneurlax
6ace239647 check if Exception 2023-07-27 13:13:15 -05:00
julian
2e9c5bde8e clean up compile time errors only 2023-07-27 12:11:30 -06:00
Diego Salazar
44aab53c9f
Bump version (v1.7.17, build 183) 2023-07-27 11:38:28 -06:00
julian
143e1d821a remove duplicate map entries 2023-07-27 11:35:44 -06:00
julian
aa2ab89f73 fix formatting 2023-07-27 11:33:39 -06:00
ryleedavis
c8d0ecf28d remove changes to ThemeAssets v1 2023-07-27 11:11:11 -06:00
sneurlax
9b4c1abf35 Merge remote-tracking branch 'origin/staging' into fusion 2023-07-27 12:03:55 -05:00
julian-CStack
4c2a58693c
Merge pull request #631 from cypherstack/ui-fixes
UI fixes
2023-07-27 10:57:19 -06:00
julian
bce8ae6b4e update _currentDefaultThemeVersion to handle xlm asset updates to default themes 2023-07-27 10:53:40 -06: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-CStack
74a3b57bcb
Merge pull request #627 from cypherstack/add-xlm
Add xlm
2023-07-27 10:43:31 -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
2130b76788 monero ref 2023-07-27 08:39:32 -06:00
julian
1e05a8dfa3 desktop ordinals details view info layout 2023-07-27 08:37:08 -06:00
julian
c178ed425d fix: ???? 2023-07-27 08:12:12 -06:00
julian
6f2ddf7423 fix: auto format code and remove electrumx coin control 2023-07-27 08:11:32 -06:00
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