Commit graph

460 commits

Author SHA1 Message Date
julian
9321480b8d Merge remote-tracking branch 'origin_SW/staging' into wallets_refactor
# Conflicts:
#	lib/models/isar/models/blockchain_data/v2/transaction_v2.dart
#	lib/pages/cashfusion/cashfusion_view.dart
#	lib/pages/cashfusion/fusion_progress_view.dart
#	lib/pages/send_view/send_view.dart
#	lib/pages/wallet_view/wallet_view.dart
#	lib/pages_desktop_specific/cashfusion/desktop_cashfusion_view.dart
#	lib/pages_desktop_specific/cashfusion/sub_widgets/fusion_dialog.dart
#	lib/pages_desktop_specific/my_stack_view/wallet_view/desktop_wallet_view.dart
#	lib/services/coins/ecash/ecash_wallet.dart
#	lib/services/coins/ethereum/ethereum_wallet.dart
#	lib/services/coins/nano/nano_wallet.dart
#	lib/services/coins/tezos/tezos_wallet.dart
#	lib/utilities/default_nodes.dart
#	lib/wallets/wallet/wallet_mixin_interfaces/cash_fusion_interface.dart
#	pubspec.lock
#	pubspec.yaml
2024-01-13 09:55:59 -06:00
julian
5fbd22d939 update spark mobile lib dep version 2024-01-12 16:00:45 -06:00
julian
fe0f816546 update spark lib ref for boost fix 2024-01-08 13:07:28 -06:00
julian
1239fd9a36 fix dependency 2024-01-08 08:58:21 -06:00
julian
af25da5a59 untested: ltc refactor 2024-01-04 18:37:46 -06:00
julian
af5d18da45 override all the things 2024-01-04 11:14:57 -06:00
julian
7870eb3e21 update ref 2024-01-04 10:52:30 -06:00
julian
c8817371dc update ref 2024-01-03 17:08:34 -06:00
julian
555448a0e9 use non local flutter_libsparkmobile 2024-01-03 10:52:48 -06:00
Diego Salazar
1d9fb4cd06
Merge pull request #709 from cypherstack/ui-fixes
various small fixes
2023-12-11 12:36:20 -07:00
Diego Salazar
2319c0e34b
Update version (v1.8.2, build 193) 2023-12-11 12:17:22 -07:00
julian
d5cb4dd6b4 backport of some tezos fixes 2023-12-04 15:45:33 -06:00
julian
6ddef9f077 add lib spark local dep for testing 2023-11-28 10:13:10 -06:00
julian
f524bc1d87 working tezos refactor 2023-11-21 13:44:21 -06:00
julian
8e1449ac41 WIP firo refactor 2023-11-20 09:15:36 -06:00
julian
5ba29b7299 mostly (roughly) refactored with new wallet providers as well as using a TxData object in place of dynamic Maps 2023-11-03 13:46:55 -06:00
Diego Salazar
9e105956e2
Bumped version (v1.8.1, build 192) 2023-10-28 19:59:51 -06:00
sneurlax
43eee96c4c update fusiondart ref to julian's equality check fix 2023-10-27 10:16:21 -05:00
sneurlax
bdcc958d9d update fusiondart ref 2023-10-26 22:51:27 -05:00
julian
c2dd868421 update fusiondart dep 2023-10-26 16:22:46 -06:00
sneurlax
390bc8026f add torForOvert flag 2023-10-26 12:29:06 -05:00
sneurlax
b5ce7c6635 replace fusiondart submodule with package 2023-10-26 10:48:54 -05:00
julian
8c186d7ae6 add fusion tx icon 2023-10-20 10:38:47 -06:00
julian
e99c32ea00 add fusion rounds selection sheet 2023-10-16 12:00:35 -06:00
sneurlax
006c0a19f3 add cashfusion svg 2023-10-16 12:38:24 -05:00
sneurlax
10e668ce7b use socks_socket#master 2023-10-02 15:04:08 -05:00
sneurlax
719b8fb46c use socks_socket submodule in fusiondart submodule
yo dawg...
2023-09-30 14:18:17 -05:00
julian
1df986e444 switch to coinlib flutter 2023-09-28 11:09:19 -06:00
julian
15417359a4 Merge remote-tracking branch 'origin_SW/staging' into fusion 2023-09-22 13:45:13 -06:00
julian
69e24de4c1 update tor dep version 2023-09-22 13:42:36 -06:00
sneurlax
55e6e56a2d replace bitcoindart with coinlib 2023-09-22 14:20:19 -05:00
Diego Salazar
3a6291241c
Bump build number (191) 2023-09-21 14:50:21 -06:00
sneurlax
f17c6a0875 Merge branch 'staging' into fusion 2023-09-21 14:55:09 -05:00
julian
ea61f22d93 update tor lib 2023-09-21 13:00:47 -06:00
Diego Salazar
10ad4f4f4f
Bump version (1.8.0) 2023-09-20 19:12:57 -06:00
Diego Salazar
3941e6d689
Update pubspec.yaml 2023-09-20 15:06:59 -06:00
julian
157901e33d one time stacy tor dialog 2023-09-20 14:39:06 -06:00
sneurlax
c43cf94c38 Merge branch 'arti' into fusion 2023-09-19 23:59:10 -05:00
sneurlax
2dc9979db2 return from connect 2023-09-19 23:58:29 -05:00
sneurlax
5bd399a625 use tor-package-exported SOCKSSocket 2023-09-19 23:58:23 -05:00
ryleedavis
0ef9759434 svgs for fusion progress dialog 2023-09-19 14:15:15 -06:00
sneurlax
ef43bc802d Merge remote-tracking branch 'origin/arti' into fusion 2023-09-18 11:16:13 -05:00
julian
d6d0e9a9af no more tor as submodule 2023-09-15 18:05:09 -06:00
sneurlax
28b2f4f6b6 Merge remote-tracking branch 'origin/arti' into fusion 2023-09-15 15:06:10 -05:00
julian
abe3f85ca8 add onion animation to assets 2023-09-15 10:20:01 -06:00
Josh Babb
47fd03817a fix stellar_flutter_sdk dep 2023-09-14 15:45:30 -05:00
Josh Babb
67f3217daf Merge arti into fusion 2023-09-14 14:45:47 -05:00
sneurlax
50466ff509 use updated cargokit, rename tor->tor_ffi_plugin 2023-09-12 13:49:25 -05:00
sneurlax
6cee28c5e5 Merge remote-tracking branch 'origin/staging' into arti 2023-09-12 11:38:29 -05:00
julian
26ce10c8ff update flutter_svg 2023-09-12 09:42:50 -06:00
sneurlax
fd5bded8a6 Merge remote-tracking branch 'origin/staging' into arti 2023-09-12 10:24:27 -05:00
julian
0e64696c20 possible "fix" for android 13 not being able to load swb files 2023-09-11 17:03:56 -06:00
Diego Salazar
f6b9548e1d
Bumped version (1.7.20, build 188) 2023-09-08 09:25:58 -06:00
sneurlax
796961ddd4 Merge branch 'tor-ui' into arti 2023-09-07 13:12:25 -05:00
sneurlax
622085ca5c Merge remote-tracking branch 'origin/staging' into arti 2023-09-07 13:12:20 -05:00
ryleedavis
1dea6cdb7d rough ui for desktop tor settings + svgs for tor settings 2023-09-05 16:26:52 -06:00
sneurlax
0ce108aa34 use cypherstack/tor, a Foundation-Devices/tor fork
use main
2023-09-04 20:13:05 -05:00
ryleedavis
f6a0950c24 WIP: tor settings view for mobile 2023-09-01 16:50:17 -06:00
sneurlax
662602bd2b use flutter_libarti main
now even newer and better
2023-09-01 17:46:42 -05:00
ryleedavis
cceab1a036 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/widgets/node_card.dart
2023-08-23 10:53:34 -06:00
sneurlax
5870417133 flutter pub add bip340 2023-08-23 09:20:17 -05:00
Diego Salazar
40ebaaa547
Bumped version (v1.7.19, build 187) 2023-08-22 20:10:12 -06:00
sneurlax
80fcdef330 Merge branch 'staging' into tor 2023-08-15 22:11:41 -05:00
Diego Salazar
27e33f4dea
Bump version (build 1.7.18, build 186) 2023-08-14 11:49:20 -06:00
sneurlax
2d130f916e tor->flutter_libtor 2023-08-08 11:01:45 -05:00
julian
9965d793bd WIP route over tor 2023-08-07 10:46:34 -06:00
julian
18e1a10ba1 Merge remote-tracking branch 'origin_SW/staging' into tor
# Conflicts:
#	pubspec.lock
2023-08-07 09:19:14 -06:00
likho
3c05c568eb Merge branch 'staging' into add-xtz 2023-08-07 17:13:55 +02:00
Josh Babb
10eb56ef43 Merge remote-tracking branch 'origin/staging' into fusion 2023-08-01 11:01:11 -05:00
Diego Salazar
65fac64352
Bump version (1.7.17, build 185) 2023-07-28 15:17:41 -06:00
detherminal
a1ef84fbe6 fix stellarTestNet and dependency problems 2023-07-28 23:00:14 +03:00
detherminal
68f3bc8731 fix dependency conflict 2023-07-28 22:15:34 +03: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
Diego Salazar
e38f845f00
Bump version (1.7.17, build 184) 2023-07-27 15:34:55 -06: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
Diego Salazar
44aab53c9f
Bump version (v1.7.17, build 183) 2023-07-27 11:38:28 -06:00
ryleedavis
197d760102 Merge branch 'staging' into add-xtz
# Conflicts:
#	pubspec.lock
2023-07-27 10:45:41 -06:00
likho
bce20eab32 Resolve merge conflicts 2023-07-27 15:05:27 +02: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
likho
be8ede7750 Fix txs being sending and receiving, and missing fee and height in tx view 2023-07-24 16:53:04 +02:00
detherminal
e0df4723ae feat: add xlm 2023-07-22 10:21:04 +02:00
ryleedavis
ee5a97c2fb add monkey icon 2023-07-21 17:59:01 -06:00
julian
051fc7d1ef Merge remote-tracking branch 'origin_SW/staging' into ordinals 2023-07-21 17:18:18 -06:00
julian-CStack
ccc6b6434c Merge remote-tracking branch 'origin_sw/staging' into ui-fixes 2023-07-19 12:44:10 -06:00
julian-CStack
43d7f39f6f macos app icon 2023-07-19 12:43:42 -06:00
Diego Salazar
db1e34d745
Bump version (1.7.16, build 182) 2023-07-19 11:30:50 -06:00
likho
022ce7ed34 Resolve merge conflicts 2023-07-19 17:00:48 +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
79670c5d47 WIP ordinal details view 2023-07-18 11:03:57 -06:00
Josh Babb
a71815ede7 Merge remote-tracking branch 'origin/staging' into tor 2023-07-12 16:50:55 -05:00
Diego Salazar
2ff855d7d0
Bump version (1.7.15, build 181) 2023-07-03 18:54:47 -06:00
julian
baec88a4f8 fix: dependency version 2023-06-22 09:44:55 -06:00
Diego Salazar
86630f2e85
Merge pull request #595 from cypherstack/custom_fee_selection
Custom fee selection
2023-06-19 15:08:52 -06:00
Diego Salazar
dbea96b80c
Bump version (1.7.14, build 180) 2023-06-19 14:35:32 -06:00
julian
43c056f264 fix: dependency override 2023-06-19 12:51:31 -06:00
detherminal
f43aeadc3f feat: add xtz 2023-06-12 22:03:32 +03:00
Diego Salazar
105e35658a
Bump version (1.7.13, build 179) 2023-06-08 14:59:21 -06:00
Diego Salazar
b283826933
Bump version (1.7.13, build 178) 2023-06-07 16:49:46 -06:00