Commit graph

323 commits

Author SHA1 Message Date
sneurlax
f17c6a0875 Merge branch 'staging' into fusion 2023-09-21 14:55:09 -05:00
julian
a6f8d4d779 add note to one time tor popup 2023-09-21 08:51:16 -06:00
julian
7155646f57 desktop tor one time dialog added and hidden dev settings enabled for desktop 2023-09-20 14:52:27 -06:00
julian
157901e33d one time stacy tor dialog 2023-09-20 14:39:06 -06:00
julian
eff2d7d539 center desktop tor button in menu 2023-09-20 13:36:59 -06:00
sneurlax
28b2f4f6b6 Merge remote-tracking branch 'origin/arti' into fusion 2023-09-15 15:06:10 -05:00
julian
4e3390a7c0 refactor TorService 2023-09-15 13:51:20 -06:00
Josh Babb
67f3217daf Merge arti into fusion 2023-09-14 14:45:47 -05:00
julian
b0f4476fc2 refactor mobile status bar tor icon 2023-09-13 10:11:14 -06:00
sneurlax
95790faf52 toggle useTor pref on text button click in wallet network settings view
and formatting
2023-09-08 16:43:24 -05:00
julian
596f917a0f extract desktop tor status button into its own widget and animate it when collapsing/expanding the desktop menu 2023-09-08 13:29:42 -06:00
julian
a97be12f57 update tests 2023-09-08 10:04:56 -06:00
julian
4de632bdb4 fix switch statement logic 2023-08-23 11:35:04 -06:00
julian
63ab0b09e8 revert enum name 2023-08-23 11:29:10 -06:00
ryleedavis
467f57c74e resolve merge conflicts 2023-08-23 10:59:13 -06: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
likho
4729789f9a Add break statements to case, add test connection to node_card and include port when testing node connection 2023-08-23 16:59:00 +02:00
Likho
c44b64f4c0
Merge branch 'staging' into xlm-bug-fixes 2023-08-23 15:24:43 +02:00
likho
961b687e27 Test node connection when updating and node and show error codes on send fail instead of generic error 2023-08-23 15:13:17 +02:00
julian
244a1914b3 verify mnemonic passphrase dialog 2023-08-22 17:06:30 -06:00
detherminal
a1ef84fbe6 fix stellarTestNet and dependency problems 2023-07-28 23:00:14 +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
sneurlax
9b4c1abf35 Merge remote-tracking branch 'origin/staging' into fusion 2023-07-27 12:03:55 -05:00
ryleedavis
197d760102 Merge branch 'staging' into add-xtz
# Conflicts:
#	pubspec.lock
2023-07-27 10:45:41 -06:00
sneurlax
87f12d9c3c Merge remote-tracking branch 'origin/staging' into fusion 2023-07-27 10:33:03 -05:00
likho
bce20eab32 Resolve merge conflicts 2023-07-27 15:05:27 +02:00
likho
7061c3c40b Add testnet to coin list 2023-07-27 13:09:56 +02:00
sneurlax
1a0d47d5c7 add placeholder asset
robothead
2023-07-26 17:06:36 -05: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
julian
c9470a5078 desktop notifications fix 2023-07-25 13:48:19 -06:00
julian
590717560e notif error fix? 2023-07-25 12:12:10 -06:00
detherminal
e0df4723ae feat: add xlm 2023-07-22 10:21:04 +02:00
julian
051fc7d1ef Merge remote-tracking branch 'origin_SW/staging' into ordinals 2023-07-21 17:18:18 -06:00
julian
9369ae15ec Merge remote-tracking branch 'origin_SW/staging' into nano_rep_change 2023-07-21 14:25:05 -06:00
julian
e7b480e585 add ba/nano wallet representative change option to wallet settings, remove coin control from ba/nano, and some other clean up 2023-07-21 14:11:30 -06:00
ryleedavis
1adc5f23a4 Merge branch 'staging' into chan-cards
# Conflicts:
#	lib/models/isar/stack_theme.dart
#	lib/models/isar/stack_theme.g.dart
2023-07-21 11:09:44 -06:00
ryleedavis
0ce86ce7fe Chan card images for favorites and wallet 2023-07-20 16:51:37 -06:00
ryleedavis
480f637670 WIP: added cardFavoriteImages + check if card should be favorites or wallet 2023-07-20 15:15:03 -06:00
julian
87a146b5a4 show failed instead of cancelled for failed eth tx 2023-07-20 15:13:56 -06:00
likho
45af21dc27 Fix merge conflicts with staging 2023-07-19 16:37:54 +02:00
julian
5b4a803215 add ordinals icon 2023-07-18 11:51:57 -06:00
julian
d894d60c1e contact address sorting 2023-07-04 17:40:06 -06:00
julian
ab9e734b80 fix: dogecoin custom fee slider and possible absurd fees error 2023-07-04 10:25:13 -06:00
julian
26bddae248 token loading screen navigation fix 2023-07-01 14:09:38 -06:00
julian
c784d2cf04 fix: disable fee selection for firo private send on desktop 2023-06-23 13:35:19 -06:00
julian
f60dee0304 Merge remote-tracking branch 'origin_SW/staging' into custom_fee_selection 2023-06-19 10:09:16 -06:00
julian
fae0c778ef feat: WIP desktop custom fee selection for supported coins 2023-06-19 10:04:25 -06:00
julian
0778deb6d3 feat: custom fee for sends on mobile for supported coins 2023-06-17 10:42:23 -06:00
julian
5880e0c5fa feat: WIP fee slider widget 2023-06-16 19:25:49 -06:00