Commit graph

150 commits

Author SHA1 Message Date
julian
24904f3476 Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	lib/utilities/show_loading.dart
2023-03-28 12:37:09 -06:00
Diego Salazar
d792e2aa82
Merge branch 'staging' into xmr_bugs 2023-03-27 15:02:24 -06:00
julian
453558d5ef extra debugging for pressing swap from within a wallet 2023-03-27 11:29:18 -06:00
julian
46e62f2b2c tx details modification to properly display eth token transaction info 2023-03-27 10:36:47 -06:00
julian
f4d61a9f58 use realAmount custom Amount class data in ui 2023-03-24 17:40:20 -06:00
julian
951c9638f3 bch zero conf fixes 2023-03-24 16:44:25 -06:00
julian
678a926ff3 bch zero conf fixes 2023-03-24 16:43:34 -06:00
julian
d2bddcdd8d add token view button to wallet nav bar 2023-03-22 09:39:28 -06:00
julian
9fa2d4535d merge fixes 2023-03-22 09:25:21 -06:00
julian
702054ac61 Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	assets/svg/themed/forest/ethereum.png
#	assets/svg/themed/forest/ethereum.svg
#	lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
#	lib/pages/receive_view/addresses/edit_address_label_view.dart
#	lib/pages/receive_view/addresses/receiving_addresses_view.dart
#	lib/pages/wallet_view/sub_widgets/wallet_navigation_bar.dart
#	lib/pages/wallet_view/wallet_view.dart
#	lib/route_generator.dart
#	lib/utilities/assets.dart
#	lib/utilities/constants.dart
#	lib/widgets/animated_widgets/rotate_icon.dart
#	pubspec.lock
#	pubspec.yaml
2023-03-22 08:54:25 -06:00
julian
38e5182fb4 firo balance fixes 2023-03-17 14:30:44 -06:00
julian
da791d483b wallet nav bar tweaks 2023-03-10 16:48:44 -06:00
julian
244b4992ed wallet navigation bar widget redesign 2023-03-10 12:42:45 -06:00
julian
a2f75a2c7b respect the coin control setting 2023-03-08 15:19:43 -06:00
julian
4c75836b4f sent to self text clean up 2023-03-08 13:29:05 -06:00
julian
79dc8e5329 balance display update events to properly reflect changes done in coin control, as well as clean up of old future builders no longer used 2023-03-08 13:21:25 -06:00
julian
3d04dc9ef8 multi select utxo ui 2023-03-07 13:53:08 -06:00
julian
d18ea7f2bf cc nav fix 2023-03-06 14:04:03 -06:00
julian
456abf7ee4 basic coin control view 2023-03-06 12:11:13 -06:00
julian
7319f509f0 add coin control option to mobile more menu + assets fix 2023-03-06 10:34:41 -06:00
julian
e3548c5ecc WIP wallet token management 2023-02-28 18:36:54 -06:00
julian
ccc7625213 fade bottom of transaction list on mobile 2023-02-28 09:18:05 -06:00
julian
1cdd3338f3 fade bottom of transaction list on mobile 2023-02-28 09:07:41 -06:00
julian
b6f58e4ce1 refresh button null error fix 2023-02-27 11:59:31 -06:00
julian
6771e39e8a forest theme icon color fixes 2023-02-27 11:59:18 -06:00
julian
82842f1aa0 token view refresh, and WIP token icon assets and other small fixes 2023-02-27 11:42:22 -06:00
julian
5aed55235c WIP eth refactor 2023-02-23 16:59:58 -06:00
julian
15b37b6f5c merge clean up and update eth to use isar for tx history and addresses 2023-02-14 11:43:48 -06:00
julian
056fa1947c Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
#	lib/pages/wallet_view/sub_widgets/wallet_navigation_bar.dart
#	lib/pages/wallet_view/wallet_view.dart
#	lib/services/price.dart
#	lib/utilities/assets.dart
#	pubspec.lock
#	pubspec.yaml
2023-02-14 08:24:04 -06:00
julian
e78fc3ef9e wallet to exchange nav fix 2023-02-08 16:51:13 -06:00
julian
998967245e migrate wallet on open 2023-02-08 07:29:27 -06:00
julian
10605d96a2 WIP exchange refactor and clean up 2023-02-05 17:50:40 -06:00
julian
5aab115b96 form state provider fix 2023-02-05 15:11:58 -06:00
julian
1455808d7a WIP refactor exchange to use isar as cache instead of in memory using riverpod 2023-02-05 14:32:39 -06:00
julian
dc2f344779 bottom nav text color change for fruit sorbet 2023-01-31 18:37:04 -06:00
julian
57dd566906 paynym bot head icon 2023-01-31 11:11:42 -06:00
julian
69934fb871 clean up transaction list item ui state update key 2023-01-31 09:42:55 -06:00
julian
69435f4807 rename and fix text button style update bug 2023-01-30 15:34:21 -06:00
julian
f61b53738c Merge remote-tracking branch 'origin/simplex' into paynyms 2023-01-30 13:11:42 -06:00
julian
225aec1763 update ui transaction state fix 2023-01-30 12:03:23 -06:00
julian
6e54ddec86 wallet bottom nav bar fixes 2023-01-30 09:13:30 -06:00
sneurlax
fecad7893b did this TODO 2023-01-27 17:40:30 -06:00
julian
61ad20e919 Merge remote-tracking branch 'origin/simplex' into paynyms
# Conflicts:
#	lib/utilities/enums/coin_enum.dart
2023-01-27 15:05:29 -06:00
julian
6c678e577b disable whirlpool button 2023-01-27 14:44:53 -06:00
sneurlax
4ddd4a292e do not display buy icon for non-Simplex currencies 2023-01-27 14:08:34 -06:00
sneurlax
6b6ef179cc add coin as arg to BuyInWalletView->BuyView->BuyForm 2023-01-27 13:47:41 -06:00
sneurlax
79e1bbf13b nest BuyView in Scaffold etc for in-wallet buy view
Thanks Julian!
2023-01-27 12:53:03 -06:00
sneurlax
59a12fe277 BROKEN, nav from wallet view to buy view 2023-01-27 12:01:27 -06:00
sneurlax
957b9cb6a3 fix buy image in wallet view on mobile 2023-01-27 11:47:42 -06:00
julian
5de22ca858 Merge branch 'simplex' into paynyms 2023-01-26 10:16:01 -06:00