Commit graph

307 commits

Author SHA1 Message Date
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
2732b2fe71 WIP: XLM fixes and refactor 2023-08-22 18:33:24 +02:00
julian
0d701a51b7 clear electrumx cache option for firo wallets 2023-08-14 09:21:27 -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
ryleedavis
197d760102 Merge branch 'staging' into add-xtz
# Conflicts:
#	pubspec.lock
2023-07-27 10:45:41 -06:00
likho
7061c3c40b Add testnet to coin list 2023-07-27 13:09:56 +02:00
detherminal
e0df4723ae feat: add xlm 2023-07-22 10:21:04 +02:00
julian
8a0a45f131 mobile rep fix 2023-07-21 16:09:47 -06:00
julian
3125a25a69 add change rep to desktop 2023-07-21 15:58:28 -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
likho
45af21dc27 Fix merge conflicts with staging 2023-07-19 16:37:54 +02:00
detherminal
0ae747aebc feat: add xtz 2023-07-19 16:19:48 +02:00
julian
87ed25bd5b use relative path for theme assets 2023-07-03 18:25:18 -06:00
julian
9513b203a9 refactor delete hive boxes in prep for hive->isar migration 2023-07-03 13:58:11 -06:00
julian
89c28a2d9d re enable git versions 2023-06-08 13:24:35 -06:00
julian
b6ed690eb6 fix: default coin units length and banano unit names 2023-06-07 13:17:49 -06:00
julian
a353ab341a Merge remote-tracking branch 'origin_SW/staging' into flutter_upgrade
# Conflicts:
#	crypto_plugins/flutter_libmonero
2023-06-05 16:26:28 -06:00
julian
117007180e fix: missing coin cases 2023-06-05 14:55:41 -06:00
julian
b92fb5b547 Merge remote-tracking branch 'origin_SW/add_nano' into flutter_upgrade
# Conflicts:
#	pubspec.lock
2023-06-05 14:48:03 -06:00
julian-CStack
58b8509b41
Merge pull request #569 from fossephate/add-nano
Banano support
2023-06-05 14:07:14 -06:00
julian
044c957152 refactor dropdown2 and qr image 2023-06-05 07:40:56 -06:00
fossephate
3c524b2ea4 add banano support 2023-05-30 19:19:31 -04:00
julian
774bfe517e fix: missing eth case 2023-05-30 10:38:47 -06:00
julian
243994ff45 fix: missing eCash case 2023-05-30 10:31:49 -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
452110c221 feat: desktop coin units gui 2023-05-30 07:44:49 -06:00
julian
f2fd998148 Merge remote-tracking branch 'origin_SW/staging' into windows
# Conflicts:
#	lib/main.dart
2023-05-29 17:57:26 -06:00
julian
528bc7405c feat: mobile amount unit selection ui 2023-05-29 16:50:21 -06:00
julian
1b1c61a3a3 feat: WIP use amount formatter in GUI 2023-05-29 15:11:48 -06:00
julian
838e623ff2 fix: update fiat price on fiat currency selection changed 2023-05-29 10:39:14 -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
detherminal
84ac798bb8 docs: add copyright header to all source code 2023-05-26 19:33:04 +03:00
Rylee Davis
60294e0144
Custom pin length (#555)
* WIP: pinCount stuff

* pin decoration + and pinCount is 0

* pin length tweaks

* fixes error when backspacing pin + add icon to flushbar

* removed Constants.pinLength + changes to "change pin" setting

* testing pin output

* WIP: tests pass + commented out isRandom pin 1234

* removed pin output

---------

Co-authored-by: ryleedavis <rylee@cypherstack.com>
Co-authored-by: julian <julian@cypherstack.com>
2023-05-26 09:45:45 -06: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
julian
0933546806 fix: various eCash tweaks + 0 conf 2023-05-24 11:00:54 -06:00
julian
206a460cfa fix: update theme button 2023-05-23 17:19:16 -06:00
julian
6065c29e0d add update theme button 2023-05-23 15:13:56 -06:00
julian
141c3f34c9 temp fix 2023-05-19 16:58:44 -06:00
julian
523fd96929 Revert "re enable git versions"
This reverts commit ab02950f03.
2023-05-19 16:53:10 -06:00
julian
ab02950f03 re enable git versions 2023-05-19 16:41:13 -06:00
julian
64c509c847 Merge remote-tracking branch 'origin_SW/add-ecash' into windows
# Conflicts:
#	lib/pages_desktop_specific/desktop_menu.dart
#	lib/pages_desktop_specific/password/delete_password_warning_view.dart
#	lib/services/coins/bitcoin/bitcoin_wallet.dart
#	lib/services/coins/bitcoincash/bitcoincash_wallet.dart
#	lib/services/coins/dogecoin/dogecoin_wallet.dart
#	lib/services/coins/firo/firo_wallet.dart
#	lib/services/coins/litecoin/litecoin_wallet.dart
#	lib/services/coins/namecoin/namecoin_wallet.dart
#	lib/services/coins/particl/particl_wallet.dart
#	lib/services/locale_service.dart
#	lib/utilities/stack_file_system.dart
#	scripts/setup.sh
2023-05-19 12:54:20 -06:00
detherminal
8f89f19b91 feat: add nano 2023-05-19 13:20:16 +03:00
julian
1991cdb6b2 add version check for default installed themes and some clean up 2023-05-18 17:00:23 -06:00
julian
0d7a0a8fb9 Merge branch 'staging' into add-ecash
# Conflicts:
#	lib/utilities/assets.dart
#	lib/utilities/theme/color_theme.dart
2023-05-17 12:11:08 -06:00
ryleedavis
e463560a5f fix support page icon color 2023-05-16 15:38:18 -06:00