Commit graph

254 commits

Author SHA1 Message Date
sneurlax
f17c6a0875 Merge branch 'staging' into fusion 2023-09-21 14:55:09 -05:00
sneurlax
8d6c355b95 revert inadvertent tx_icon change
whoopsie
2023-09-20 13:19:39 -05:00
sneurlax
c43cf94c38 Merge branch 'arti' into fusion 2023-09-19 23:59:10 -05:00
sneurlax
12b3dd58a8 remove prints from prod 2023-09-19 23:57:52 -05: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
6fe0bfef81 add tor icon to wallet view 2023-09-12 16:45:57 -05:00
sneurlax
fd5bded8a6 Merge remote-tracking branch 'origin/staging' into arti 2023-09-12 10:24:27 -05:00
julian
6f06bb834f only show epic cancel button if no confirmations 2023-09-11 12:48:32 -06:00
sneurlax
f2af2b10bd Revert "Merge branch 'tor' into tor-presocks"
This reverts commit 75750e2bd1.
2023-08-15 22:10:41 -05:00
sneurlax
8c47456077 Merge remote-tracking branch 'origin/staging' into fusion 2023-08-14 12:31:45 -05: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
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
ryleedavis
8b8ce89ced Monkey option only shows for banano wallets 2023-07-27 14:08:08 -06:00
sneurlax
87f12d9c3c Merge remote-tracking branch 'origin/staging' into fusion 2023-07-27 10:33:03 -05: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
d8e6f3cac6 fix mobile nav error 2023-07-26 16:15:29 -06:00
sneurlax
4e134664e7 show CashFusion option in wallet More dialog 2023-07-26 17:07:56 -05:00
ryleedavis
86d3258910 Monkey help message 2023-07-26 13:18:18 -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
8ac085fe24 fix monkey icon 2023-07-21 18:01:38 -06:00
ryleedavis
ee5a97c2fb add monkey icon 2023-07-21 17:59:01 -06:00
ryleedavis
fb39e96308 WIP: monkey view + fetching monkey dialog 2023-07-21 17:56:01 -06:00
julian
051fc7d1ef Merge remote-tracking branch 'origin_SW/staging' into ordinals 2023-07-21 17:18:18 -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
480f637670 WIP: added cardFavoriteImages + check if card should be favorites or wallet 2023-07-20 15:15:03 -06:00
julian
8a84c89824 show failed instead of cancelled for eth failed txns 2023-07-20 15:13:56 -06:00
julian
5b4a803215 add ordinals icon 2023-07-18 11:51:57 -06:00
julian
58c97de86c WIP ordinal ui 2023-07-18 10:15:05 -06:00
likho
1ce64cd157 Fix on chain notes showing for other coins 2023-07-05 18:18:49 +02:00
likho
ca27f13d7b WIP:Add onchain notes for Epic 2023-07-05 14:57:17 +02:00
julian
61e074e3cd Merge remote-tracking branch 'origin_SW/staging' into amount_separators 2023-06-16 17:13:28 -06:00
julian
346a6a7a01 account for units setting 2023-06-16 17:04:39 -06:00
julian
c0eb85ce5a insert and handle localised group and decimal separators in textfield amounts 2023-06-16 16:47:03 -06:00
julian
bc0c9168b5 fix: coin card chan aspect ratio 2023-06-15 17:47:58 -06:00
julian
ed120f552a Merge branch 'ba_nano_fixes' into ui-fixes 2023-06-08 11:03:50 -06:00
julian
d69b21b4a8 create single coin card widget 2023-06-08 10:59:44 -06:00
julian
91fb2598c4 fix: do not show fees on (ba)nano tx details screen 2023-06-08 09:11:43 -06:00
julian
cd1736ffa6 png fix 2023-06-07 16:05:49 -06:00
julian
440235b6de WIP: add fav card chan images 2023-06-07 16:02:32 -06:00
julian
35843e5e62 small changes 2023-06-07 14:57:15 -06:00
ryleedavis
8d823dc2e3 WIP: chan cards 2023-06-07 14:34:27 -06:00
julian
d627f8e73c fix: animation duration/period not set before calling repeat 2023-06-07 09:02:22 -06:00
julian
1449814e35 Merge branch 'amount_display_precision' into add_nano
# Conflicts:
#	lib/pages/pinpad_views/create_pin_view.dart
#	lib/widgets/custom_pin_put/custom_pin_put_state.dart
2023-05-30 09:11:41 -06:00
julian
79a22e12c3 Merge remote-tracking branch 'origin_SW/staging' into amount_display_precision 2023-05-30 09:04:34 -06:00