Commit graph

377 commits

Author SHA1 Message Date
julian
051fc7d1ef Merge remote-tracking branch 'origin_SW/staging' into ordinals 2023-07-21 17:18:18 -06:00
ryleedavis
269f47d6f4 resolved merge conflict 2023-07-21 11:34:14 -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
sneurlax
f46a37d4d4 convert/map/cast InscriptionData->Ordinal 2023-07-21 11:48:31 -05:00
ryleedavis
480f637670 WIP: added cardFavoriteImages + check if card should be favorites or wallet 2023-07-20 15:15:03 -06:00
ryleedavis
308f982593 added chan card favorites to stack_theme 2023-07-20 14:25:58 -06:00
julian
c435c378e0 rough outline for isar schema class 2023-07-19 15:37:11 -06:00
julian
58c97de86c WIP ordinal ui 2023-07-18 10:15:05 -06:00
julian
d894d60c1e contact address sorting 2023-07-04 17:40:06 -06:00
julian
36cb3c2a69 fix: ios path fix 2023-07-03 18:46:58 -06:00
julian
87ed25bd5b use relative path for theme assets 2023-07-03 18:25:18 -06:00
julian
ae75867381 null error fix for themes that don't have coin card images 2023-06-08 11:35:05 -06:00
julian
1c88ca5f8d update assets schema 2023-06-08 10:35:44 -06:00
ryleedavis
8e00948bce WIP: null check 2023-06-07 15:24:13 -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
a047eac770 add wallet summary card background image optional param to theme assets 2023-06-07 09:11:54 -06:00
julian
84ab43ced1 fix: some theme issues 2023-06-05 16:25:41 -06:00
julian-CStack
58b8509b41
Merge pull request #569 from fossephate/add-nano
Banano support
2023-06-05 14:07:14 -06:00
fossephate
3c524b2ea4 add banano support 2023-05-30 19:19:31 -04: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
likho
436b11a102 Generate isar model/ fix status showing incorrectly in the transaction view page 2023-05-29 14:33:57 +02:00
likho
83778bb121 Fix Epiccash caching issue, add additional status messages as in Epicpay 2023-05-28 14:57:05 +02:00
julian-CStack
3f7b547cfd
Merge pull request #557 from detherminal/add_nano
add copyright generating script
2023-05-26 16:46:34 -06:00
detherminal
95a0309b8b docs: add header to source code again 2023-05-27 00:21:16 +03:00
detherminal
ccf5e68fc6 Revert "docs: add copyright header to all source code"
This reverts commit 84ac798bb8.
2023-05-27 00:19:24 +03:00
fossephate
3586383f93 balance fixes, sync status working, and transaction view working 2023-05-26 14:47:50 -04:00
detherminal
84ac798bb8 docs: add copyright header to all source code 2023-05-26 19:33:04 +03:00
julian
553e035ca7 Merge remote-tracking branch 'origin_SW/staging' into add_nano
# Conflicts:
#	lib/models/isar/stack_theme.dart
#	lib/models/isar/stack_theme.g.dart
#	lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
#	lib/services/coins/firo/firo_wallet.dart
#	lib/themes/coin_icon_provider.dart
#	lib/themes/coin_image_provider.dart
#	lib/utilities/constants.dart
#	lib/utilities/enums/coin_enum.dart
2023-05-24 11:37:37 -06:00
fossephate
7a95c20645 nano sending + minor sats constants refactor 2023-05-24 11:56:44 -04:00
detherminal
8f89f19b91 feat: add nano 2023-05-19 13:20:16 +03:00
julian
b946bba01b v2 theme assets 2023-05-18 12:52:48 -06:00
julian
c82564c96c disable ecash assets in prep for dynamic theme coin assets migrate 2023-05-18 09:35:12 -06:00
ryleedavis
bc6185801d corrected ecash json path 2023-05-18 09:02:37 -06:00
julian
ee21a2dbb5 WIP prepare for ecash assets 2023-05-17 16:57:38 -06:00
julian
59c1a49ee7 Merge branch 'ui-fixes' into address_book_isar
# Conflicts:
#	lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart
#	lib/utilities/db_version_migration.dart
2023-05-15 14:15:34 -06:00
julian
52bffbac08 add contacts migration from hive to isar and remove contact class conversion 2023-05-15 14:12:06 -06:00
julian
9764ad0d14 fix: added new color to fix orange theme issue 2023-05-15 10:43:23 -06:00
detherminal
524f4c5514 feat: move address books to isar 2023-05-14 18:06:47 +03:00
julian
e032e90957 update theme schema to add support for preview assets 2023-05-12 10:19:15 -06:00
julian
6990d60b9b various fixes, layout tweaks, and refactoring 2023-05-10 16:49:56 -06:00
julian
4213eca928 Merge remote-tracking branch 'origin_SW/staging' into themes
# Conflicts:
#	lib/db/isar/main_db.dart
2023-05-09 18:00:17 -06:00
julian
4fe014287c fix: assets paths 2023-05-09 17:18:27 -06:00
julian
e53e7e5055 set up installing of themes and including default themes 2023-05-09 15:58:42 -06:00
julian
9de6d0619d fix: ThemeAssets embedded constructor and generate Isar schema 2023-05-09 14:59:16 -06:00
julian
d182fd2740 replace ThemeType enum with themeId Strings 2023-05-09 14:20:29 -06:00
julian
80a23c4bee update stack theme class to parse json properly 2023-05-09 14:04:48 -06:00
julian
aae766cdba update a few more assets and added missing background asset to theme class 2023-05-09 10:59:55 -06:00
julian
7da7302e63 fix: added missing assets to theme and updated more references to use theme provided assets 2023-05-09 10:51:30 -06:00
julian
8f5da9c4da fix: add missing buy image to theme and fix a couple other asset refs 2023-05-09 10:30:06 -06:00
julian
7da9f3b6e1 add secondary images to differentiate between chan plain and kiss coin gifs 2023-05-09 09:48:28 -06:00
julian
f3da99fd00 use id given by server 2023-05-09 09:26:19 -06:00
julian
575ec170f8 fix: added missing exchange status icon assets 2023-05-09 09:14:48 -06:00
julian-CStack
f9f6d749ef Merge remote-tracking branch 'origin_SW/staging' into themes 2023-05-08 10:55:11 -06:00
julian
c8655d56bc Merge remote-tracking branch 'origin_SW/staging' into custom_block_explorers 2023-05-08 08:20:52 -06:00
julian
8ebd4f3a5f update generated files 2023-05-04 14:33:34 -06:00
julian
e3c0f58abc custom block explorer isar model/schema 2023-05-04 14:33:19 -06:00
julian
34d9360f20 delete empty/unused files 2023-05-04 12:20:08 -06:00
julian
3a97623e5b WIP exchange screen state refactor 2023-05-03 14:03:31 -06:00
likho
23ab681039 Move the rest of the themes to Json 2023-05-02 19:06:46 +02:00
julian
3564426248 show trocador provider options 2023-05-02 10:22:35 -06:00
likho
fa6e7d907e Update themes structure 2023-05-02 15:10:50 +02:00
julian
e81521e374 WIP exchange process refactor to handle multiple sub providers per exchange provider 2023-05-01 16:26:12 -06:00
julian
05c4d01ee4 initial Trocador integration 2023-04-28 14:31:26 -06:00
julian
d3b3092281 code readability 2023-04-28 14:29:30 -06:00
julian
da9b921ddc pass around estimate instead of just rateId 2023-04-28 14:29:10 -06:00
likho
228afdd29a Merge branch 'themes' of github.com:cypherstack/stack_wallet into themes 2023-04-28 14:29:06 +02:00
likho
3b3e14ed7f Clean up, use flat structure for assets 2023-04-28 14:28:46 +02:00
julian
c9c9e79b5c Merge branch 'ui-fixes' into themes 2023-04-27 17:07:04 -06:00
likho
29a5a98063 Add light theme to json, clean out chan colors from dark theme 2023-04-27 14:17:33 +02:00
julian
289009be18 ensure only non segwit payment code is ever shown 2023-04-26 12:29:43 -06:00
likho
707dc204c5 Ensure themes path is loaded, use testing theme name instead of UUID 2023-04-26 14:26:35 +02:00
julian
8c3fffde9d segwit paynym.is updates and fixes 2023-04-25 15:06:12 -06:00
likho
857f0f2acc Clean up 2023-04-25 15:58:51 +02:00
likho
4ed34ad50f Correctly parse gradient 2023-04-25 15:12:56 +02:00
likho
d42f48ceee resolve json errors, move assets json into themes json 2023-04-24 19:36:05 +02:00
likho
c6ffe14a4e Rename assets json file 2023-04-24 18:42:22 +02:00
likho
5748de2251 Theme colors error fixes 2023-04-24 17:31:05 +02:00
julian-CStack
ec00f6aea4 WIP testing themes 2023-04-24 08:36:12 -06:00
likho
66f17b2ba1 Get assets from json 2023-04-24 14:53:51 +02:00
ryleedavis
15c2a8bb29 added boxShadowExt + boxShadows to ColorTheme 2023-04-21 09:57:20 -06:00
ryleedavis
00a287be53 merge conflicts 2023-04-20 10:18:33 -06:00
ryleedavis
1ae97df42a resolve merge conflict 2023-04-20 10:12:57 -06:00
ryleedavis
962fab6e3e added color ints to color theme 2023-04-20 10:11:05 -06:00
julian
e3888be1b1 embedded assets, provider, and example 2023-04-20 09:32:50 -06:00
julian-CStack
f6becfbe77 WIP re themeing 2023-04-18 10:46:04 -06:00
julian
3db3ad06c5 WIP isar theme class 2023-04-18 09:15:52 -06:00
julian
b2d2f20b50 WIP replacement for Map<String, dynamic> transactionObject 2023-04-11 09:18:29 -06:00
julian
5bf678d41a Balance class clean up 2023-04-10 12:00:23 -06:00
julian
4409562a94 clean up balance file 2023-04-09 13:00:47 -06:00
julian
1305b9f37c token balance json serialization fix 2023-04-07 14:13:28 -06:00
julian
25ff880280 move amount.dart file 2023-04-06 15:24:56 -06:00
julian
81c612ddd7 WIP use Amount 2023-04-05 16:06:31 -06:00
julian
563799feee Merge remote-tracking branch 'origin/staging' into add-ethereum 2023-04-03 10:37:51 -06:00
julian
b1e6ee8d47 Revert "disabled mb"
This reverts commit c9eba36f31.
2023-04-01 09:04:34 -06:00
julian
c8139007e3 use new transaction nonce property 2023-03-31 10:18:51 -06:00
julian
606e70a061 add nonce property to Transaction 2023-03-31 09:39:03 -06:00
julian
f69f9a5038 Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	lib/widgets/wallet_card.dart
2023-03-29 14:09:23 -06:00
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
julian
4afa344965 only validate address in contact address entry form if a coin is selected 2023-03-28 09:17:22 -06:00
julian
c9eba36f31 disabled mb 2023-03-25 19:27:42 -06:00
julian
f4d61a9f58 use realAmount custom Amount class data in ui 2023-03-24 17:40:20 -06:00
julian
f7b2f01f01 update generated transaction part 2023-03-24 15:55:04 -06:00
julian
b2b9accee1 add serialized amount string to transaction 2023-03-24 15:31:05 -06:00
julian
44a87df41c merge clean up 2023-03-23 18:21:09 -06:00
julian
3e1e68237a Merge remote-tracking branch 'origin/staging' into add-ethereum
# Conflicts:
#	lib/models/isar/models/blockchain_data/address.dart
#	lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
#	lib/pages/settings_views/global_settings_view/appearance_settings_view.dart
#	lib/pages_desktop_specific/settings/settings_menu/appearance_settings.dart
#	lib/utilities/db_version_migration.dart
#	test/pages/send_view/send_view_test.mocks.dart
#	test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.mocks.dart
#	test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.mocks.dart
#	test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.mocks.dart
#	test/screen_tests/exchange/exchange_view_test.mocks.dart
#	test/screen_tests/lockscreen_view_screen_test.mocks.dart
#	test/screen_tests/main_view_tests/main_view_screen_testA_test.mocks.dart
#	test/screen_tests/main_view_tests/main_view_screen_testB_test.mocks.dart
#	test/screen_tests/main_view_tests/main_view_screen_testC_test.mocks.dart
#	test/screen_tests/onboarding/backup_key_view_screen_test.mocks.dart
#	test/screen_tests/onboarding/backup_key_warning_view_screen_test.mocks.dart
#	test/screen_tests/onboarding/create_pin_view_screen_test.mocks.dart
#	test/screen_tests/onboarding/restore_wallet_view_screen_test.mocks.dart
#	test/screen_tests/onboarding/verify_backup_key_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
#	test/screen_tests/settings_view/settings_view_screen_test.mocks.dart
#	test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.mocks.dart
#	test/screen_tests/wallet_view/confirm_send_view_screen_test.mocks.dart
#	test/screen_tests/wallet_view/receive_view_screen_test.mocks.dart
#	test/screen_tests/wallet_view/send_view_screen_test.mocks.dart
#	test/screen_tests/wallet_view/wallet_view_screen_test.mocks.dart
#	test/widget_tests/managed_favorite_test.mocks.dart
#	test/widget_tests/table_view/table_view_row_test.mocks.dart
#	test/widget_tests/transaction_card_test.mocks.dart
#	test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart
#	test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
2023-03-23 18:13:24 -06:00
julian
e99ef7497c update eth contract isar model class 2023-03-23 09:38:17 -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
c35eaf0b0f WIP address details 2023-03-21 17:18:07 -06:00
julian
172429f94a add address tags property and update generated 2023-03-21 10:37:01 -06:00
julian
260771061c prepare paynym interface to use SigningData 2023-03-09 12:31:36 -06:00
julian
ec237d0001 Merge remote-tracking branch 'origin/staging' into coin_control 2023-03-08 13:42:12 -06:00
julian
2b1d438953 balance refresh and total display fixes 2023-03-08 13:03:04 -06:00
julian
cf6fb46c5c update utxo 2023-03-08 08:57:17 -06:00
sneurlax
89c84a44b4 fix failing casts 2023-03-07 11:57:33 -06:00
sneurlax
af15f89d38 typo fix 2023-03-07 11:57:13 -06:00
julian
e40cb3d66d utxo details ui and edit functionality 2023-03-07 11:11:57 -06:00
julian
6465faa4e1 btc update utxo set 2023-03-07 09:00:42 -06:00
julian
2ccf6bfc71 utxo bugfix 2023-03-07 08:07:04 -06:00
julian
251f90834c update UTXO schema 2023-03-06 14:39:41 -06:00
julian-CStack
e8e8ffdf60
Merge branch 'staging' into mb-fixes 2023-03-03 15:15:58 -06:00
julian
40ca565d54 mb order status util and extra logging 2023-03-03 14:46:53 -06:00
julian
babbd75da3 use database contract data and contract management updates 2023-03-02 18:40:12 -06:00
sneurlax
83d0157600 add and use EpicBoxConfigModel and EpicBoxServerModel 2023-03-02 14:51:19 -06:00
julian
4cec54620a eth contract isar schema 2023-03-02 14:08:54 -06:00
julian
5bf18a541a json serialize fix 2023-03-01 14:03:44 -06:00
julian
e3548c5ecc WIP wallet token management 2023-02-28 18:36:54 -06:00
julian
0c11e859aa changenow v2 currencies call to access tokenContract param 2023-02-28 14:27:42 -06:00
julian
695d43bbd5 add token list ui 2023-02-28 13:26:17 -06:00
julian
d07906c4a7 add wallet entity clean up 2023-02-27 17:15:05 -06:00
julian
fcd8f01d93 convert token service to change notifier, add token cache per eth wallet, token balances, and fix routing issues 2023-02-27 10:01:06 -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
218017ca51 populate initial values in exchange form 2023-02-10 08:04:12 -06:00
julian
8fa5aa779a json object serialize/deserialize 2023-02-09 16:02:01 -06:00
julian
86ca402401 close exchange step 4 back to wallet or exchange home view 2023-02-09 07:31:31 -06:00
julian
2eb0b2e123 clean up exchange rate type enum, build runner mocks 2023-02-08 16:46:30 -06:00
julian
4630d616cd only show exchanges supported by selected aggregate currency pair based on exchange flow type 2023-02-08 14:06:58 -06:00
julian
b1c8a56ba6 aggregate currency 2023-02-08 13:06:26 -06:00
julian
ae697928a6 no caching or switching of currencies based on exchange selection 2023-02-08 11:37:58 -06:00
julian
d4db845494 Merge branch 'exchange_refactor' into paynyms
# Conflicts:
#	test/pages/send_view/send_view_test.mocks.dart
#	test/widget_tests/managed_favorite_test.mocks.dart
#	test/widget_tests/table_view/table_view_row_test.mocks.dart
#	test/widget_tests/wallet_card_test.mocks.dart
#	test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart
#	test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
2023-02-07 11:17:16 -06:00
julian
62f7ebbc3c Merge branch 'majestic_bank' into paynyms 2023-02-07 11:16:26 -06:00
julian
243acd09ba fix when leaving and returning to exchange view 2023-02-06 15:50:18 -06:00
julian
15207fc7f1 cache currencies and revert if needed on switching exchanges where currencies aren't available on both exchanges 2023-02-06 12:29:00 -06:00
julian
f174efcec0 clean up and exchange form state bug fixes 2023-02-06 10:27:24 -06:00
julian
be2a52301e clean up and QoL mods to exchange_form_state.dart 2023-02-06 09:44:23 -06:00
julian
18e089179b simplify Currency class and fixed image loading issue 2023-02-06 09:23:31 -06:00
julian
3d01ec8598 reduce size of Pair class 2023-02-06 08:43:16 -06:00
julian
10605d96a2 WIP exchange refactor and clean up 2023-02-05 17:50:40 -06:00