Commit graph

4063 commits

Author SHA1 Message Date
detherminal
68f3bc8731 fix dependency conflict 2023-07-28 22:15:34 +03: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
ryleedavis
5c06d9dc59 format adjustments + remove tezos from themeAssetsv1 2023-07-28 10:32:50 -06:00
ryleedavis
be0d820822 Merge branch 'add-xtz' of https://github.com/cypherstack/stack_wallet into add-xtz 2023-07-28 08:45:49 -06:00
Rylee Davis
78be92110d
Merge pull request #639 from detherminal/add-xtz
xtz: update api and add price
2023-07-28 08:45:24 -06:00
detherminal
3077465e81 xtz: update api and add price 2023-07-28 13:39:07 +03:00
julian-CStack
1920034e1f
Merge pull request #638 from cypherstack/ui-fixes
UI fixes
2023-07-27 15:44:58 -06:00
julian
67d735fb66 Merge remote-tracking branch 'origin_SW/staging' into ui-fixes 2023-07-27 15:44:12 -06:00
julian
a6a7b53837 show file path on image save 2023-07-27 15:42:58 -06:00
julian
c1b7c9239b monke fix 2023-07-27 15:36:14 -06:00
Diego Salazar
e38f845f00
Bump version (1.7.17, build 184) 2023-07-27 15:34:55 -06:00
julian-CStack
1783ca6517
Merge pull request #637 from cypherstack/ui-fixes
UI fixes
2023-07-27 15:21:20 -06:00
julian
4991ca3341 update rpc related tests 2023-07-27 15:18:02 -06:00
julian
21d81a9574 update mocks 2023-07-27 15:08:43 -06:00
julian
4edd59f0ec Merge remote-tracking branch 'origin_SW/staging' into ui-fixes 2023-07-27 14:59:00 -06:00
julian-CStack
2bc9813ab5
Merge pull request #632 from cypherstack/ordinals
Fix ordinals null issue and re-add to UI
2023-07-27 14:56:41 -06:00
julian-CStack
690a170694
Merge pull request #633 from detherminal/add-xtz
fix: fetch from nodes instead of tzkt
2023-07-27 14:54:16 -06:00
julian
7765ed2465 fix request timeout bug 2023-07-27 14:42:03 -06:00
Diego Salazar
085895fb4d Bump version (v1.7.17, build 183) 2023-07-27 14:42:03 -06:00
Josh Babb
c44623a8ea hasWhirlpoolSupport->hasOrdinalsSupport 2023-07-27 15:32:32 -05:00
Josh Babb
5f604eba3c fix response-counting logic
could be improved yet...
2023-07-27 15:32:18 -05:00
detherminal
2ee65b584e fix: fetch from nodes instead of tzkt 2023-07-27 23:15:49 +03:00
ryleedavis
8b8ce89ced Monkey option only shows for banano wallets 2023-07-27 14:08:08 -06:00
sneurlax
1674c04020 test mock update 2023-07-27 14:47:29 -05:00
sneurlax
c847656ca5 autoformatting 2023-07-27 14:47:22 -05:00
sneurlax
c584cb862d don't assume list isn't null 2023-07-27 14:47:16 -05:00
Diego Salazar
44aab53c9f
Bump version (v1.7.17, build 183) 2023-07-27 11:38:28 -06:00
ryleedavis
c8d0ecf28d remove changes to ThemeAssets v1 2023-07-27 11:11:11 -06: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
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