Commit graph

4630 commits

Author SHA1 Message Date
Josh Babb
848a6ea1be fusiondart#no_flutter 2023-07-28 13:27:42 -05: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
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
f9fa0acb8c pass in only required utxo data 2023-07-27 17:23:25 -06:00
julian
8e767d200e use updated package 2023-07-27 17:13:03 -06:00
Josh Babb
a35ad753f1 fix protobuf 2023-07-27 17:17:44 -05:00
Josh Babb
f1854aea7f downgrade fusiondart protobuf package for conflict resolution purposes 2023-07-27 17:13:25 -05: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-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
Josh Babb
0d3c98c83c downgrade fusiondart protobuf package for conflict resolution purposes 2023-07-27 16:36:41 -05: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
Josh Babb
cb9fa5a5b0 Merge branch 'fusiondart' into origin/fusion 2023-07-27 16:15:48 -05:00
julian
21d81a9574 update mocks 2023-07-27 15:08:43 -06:00
Josh Babb
945c21934d update fusiondart submodule pub 2023-07-27 16:04:39 -05: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
sneurlax
d0e3474368 move fusion dart code to fusiondart package as submodule
https://github.com/cypherstack/fusiondart
2023-07-27 14:39:36 -05:00
sneurlax
571fd960b8 autoformatting 2023-07-27 13:43:25 -05:00
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