Commit graph

1288 commits

Author SHA1 Message Date
sneurlax
8c47456077 Merge remote-tracking branch 'origin/staging' into fusion 2023-08-14 12:31:45 -05:00
Diego Salazar
b6aa7a974a
Merge pull request #647 from cypherstack/ui-fixes
clear electrumx cache option for firo wallets
2023-08-14 11:27:51 -06:00
julian
0d701a51b7 clear electrumx cache option for firo wallets 2023-08-14 09:21:27 -06:00
likho
ea47e41d90 Allow cancelling incoming txs for Epiccash 2023-08-02 13:30:06 +02:00
Josh Babb
10eb56ef43 Merge remote-tracking branch 'origin/staging' into fusion 2023-08-01 11:01:11 -05:00
Likho
6a750c9356
Merge branch 'staging' into fix-desktop-onchain-notes 2023-07-31 15:00:51 +02:00
likho
ff944928b6 fix: Onchain notes missing for desktop 2023-07-31 12:16:08 +02:00
julian
64d946e752 apply lelantus rescan on desktop 2023-07-28 13:53:14 -06:00
julian
8c91e0f3b8 WIP mobile one time firo rescan 2023-07-28 13:10:57 -06:00
julian
92f19de43c WIP one time firo rescan 2023-07-28 10:55:04 -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
julian
a6a7b53837 show file path on image save 2023-07-27 15:42:58 -06:00
ryleedavis
8b8ce89ced Monkey option only shows for banano wallets 2023-07-27 14:08:08 -06:00
sneurlax
9b4c1abf35 Merge remote-tracking branch 'origin/staging' into fusion 2023-07-27 12:03:55 -05:00
julian
4281fa5d33 Merge remote-tracking branch 'origin_SW/staging' into ui-fixes 2023-07-27 10:43:49 -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
sneurlax
87f12d9c3c Merge remote-tracking branch 'origin/staging' into fusion 2023-07-27 10:33:03 -05:00
julian
8b88890e05 refactor network call into mockable provider and handle errors 2023-07-27 09:28:01 -06:00
julian
a194594b4d Merge remote-tracking branch 'origin_SW/staging' into add-xlm 2023-07-27 07:57:58 -06: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
julian
703863cab8 reorder firo balance sheet on mobile 2023-07-26 17:21:36 -06: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
julian
4d87096324 temp disable some ordinals stuff 2023-07-26 17:01:24 -06:00
julian
7390c498c7 set state on download 2023-07-26 16:29:09 -06:00
ryleedavis
04b9cddb19 fixed path 2023-07-26 16:23:34 -06:00
ryleedavis
8754142694 android file path 2023-07-26 16:21:20 -06:00
julian
d8e6f3cac6 fix mobile nav error 2023-07-26 16:15:29 -06:00
julian
2f5a18b615 merge conflict clean things 2023-07-26 16:10:27 -06:00
julian
bf309d4902 Merge remote-tracking branch 'origin_SW/add-monkey' into add-monkey
# Conflicts:
#	lib/pages/monkey/monkey_view.dart
2023-07-26 16:09:10 -06:00
julian
9d2b315bd9 desktop layout 2023-07-26 16:08:01 -06:00
sneurlax
4e134664e7 show CashFusion option in wallet More dialog 2023-07-26 17:07:56 -05:00
ryleedavis
39882b0d46 monkey icon in app bar 2023-07-26 16:07:54 -06:00
sneurlax
d3832a56b5 add CashFusionView 2023-07-26 17:07:06 -05:00
julian
0175939d63 download/save image on linux 2023-07-26 15:52:52 -06:00
ryleedavis
4e9ba50572 Desktop what is monkey button 2023-07-26 15:37:10 -06:00
julian
b2aa4272b4 reorg and loading indicator 2023-07-26 15:32:00 -06:00
ryleedavis
66e1db9b52 WIP: scaling monkey view for desktop 2023-07-26 15:10:53 -06:00
ryleedavis
86d3258910 Monkey help message 2023-07-26 13:18:18 -06:00
ryleedavis
ea9f997d0b Merge branch 'staging' into add-monkey
# Conflicts:
#	lib/services/coins/banano/banano_wallet.dart
2023-07-26 12:07:36 -06:00
ryleedavis
032061fa19 changed generate monkey structure 2023-07-26 12:03:01 -06:00
ryleedavis
2eb10e249f add monkey image to hive and display on wallet card 2023-07-26 11:54:10 -06:00
ryleedavis
683364750a structure change to add monkey image 2023-07-26 11:13:48 -06:00
ryleedavis
78e4cd4631 removed unnecessary lines 2023-07-25 17:42:36 -06:00
ryleedavis
512960d9b9 changed monkey files around 2023-07-25 17:29:05 -06:00
ryleedavis
c6c2b42923 monkey.svg download to user device 2023-07-25 17:06:32 -06:00
ryleedavis
b2ec2763fb monkey.png downloads to user device 2023-07-25 16:51:21 -06:00
ryleedavis
3cbde8b5c1 able to download monkey.png 2023-07-25 14:52:58 -06:00