828 commits

Author	SHA1	Message	Date
ryleedavis	0ef9759434	svgs for fusion progress dialog	2023-09-19 14:15:15 -06:00
sneurlax	28b2f4f6b6	Merge remote-tracking branch 'origin/arti' into fusion	2023-09-15 15:06:10 -05:00
julian	4e3390a7c0	refactor TorService	2023-09-15 13:51:20 -06:00
julian	abe3f85ca8	add onion animation to assets	2023-09-15 10:20:01 -06:00
Josh Babb	67f3217daf	Merge arti into fusion	2023-09-14 14:45:47 -05:00
sneurlax	5ac7ae95cb	formatting	2023-09-13 16:49:37 -05:00
julian	4b518243c6	Tor kill switch getter name refactor and bugfix	2023-09-13 10:33:44 -06:00
sneurlax	ba42b76296	WIP showing that added Content-Lengths get stripped/ignored	2023-09-11 18:41:37 -05:00
ryleedavis	5b863dcb9d	tor http connection	2023-09-11 14:29:10 -06:00
ryleedavis	5053e7d97a	WIP: tor http connection	2023-09-11 14:20:40 -06:00
ryleedavis	f240163a91	WIP: tor http connection	2023-09-08 15:09:59 -06:00
sneurlax	3e36723da3	TorStatusChangedEvent->TorPreferenceChangedEvent	2023-09-07 15:37:23 -05:00
sneurlax	796961ddd4	Merge branch 'tor-ui' into arti	2023-09-07 13:12:25 -05:00
sneurlax	622085ca5c	Merge remote-tracking branch 'origin/staging' into arti	2023-09-07 13:12:20 -05:00
julian	6e625e2c74	add tor status change event and fire on pref changed	2023-09-07 09:20:45 -06:00
ryleedavis	1dea6cdb7d	rough ui for desktop tor settings + svgs for tor settings	2023-09-05 16:26:52 -06:00
ryleedavis	f6a0950c24	WIP: tor settings view for mobile	2023-09-01 16:50:17 -06:00
julian	2e64d35629	tezos does not used the bip39 lib directly. Do not show new wallet options. Needs more investigation	2023-08-23 11:49:21 -06:00
julian	63ab0b09e8	revert enum name	2023-08-23 11:29:10 -06:00
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	c44b64f4c0	Merge branch 'staging' into xlm-bug-fixes	2023-08-23 15:24:43 +02:00
likho	961b687e27	Test node connection when updating and node and show error codes on send fail instead of generic error	2023-08-23 15:13:17 +02:00
julian	04bba2bf2a	new wallet mnemonic options for supported coins	2023-08-22 15:07:08 -06:00
likho	2732b2fe71	WIP: XLM fixes and refactor	2023-08-22 18:33:24 +02:00
likho	d785a2ef83	Fix error with Stellar pretty name not found	2023-08-14 10:14:47 +02:00
julian	99dc1aef42	add tor pref	2023-08-07 11:20:54 -06:00
julian	53b8adca16	basic tor service	2023-08-07 10:39:04 -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	5c06d9dc59	format adjustments + remove tezos from themeAssetsv1	2023-07-28 10:32:50 -06:00
ryleedavis	be0d820822	Merge branch 'add-xtz' of https://github.com/cypherstack/stack_wallet into add-xtz	2023-07-28 08:45:49 -06:00
detherminal	2ee65b584e	fix: fetch from nodes instead of tzkt	2023-07-27 23:15:49 +03:00
sneurlax	9b4c1abf35	Merge remote-tracking branch 'origin/staging' into fusion	2023-07-27 12:03:55 -05:00
ryleedavis	197d760102	Merge branch 'staging' into add-xtz ... # Conflicts: # pubspec.lock	2023-07-27 10:45:41 -06:00
sneurlax	87f12d9c3c	Merge remote-tracking branch 'origin/staging' into fusion	2023-07-27 10:33:03 -05:00
likho	bce20eab32	Resolve merge conflicts	2023-07-27 15:05:27 +02:00
likho	e8b91c5287	Update testnet block explorer	2023-07-27 13:20:19 +02:00
likho	7061c3c40b	Add testnet to coin list	2023-07-27 13:09:56 +02: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	f27e818d97	Merge remote-tracking branch 'origin_SW/staging' into add-monkey	2023-07-26 16:29:32 -06:00
sneurlax	1a0d47d5c7	add placeholder asset ... robothead	2023-07-26 17:06:36 -05:00
julian	80dad5156a	Merge remote-tracking branch 'origin_SW/ui-fixes' into ordinals ... # Conflicts: # lib/db/isar/main_db.dart	2023-07-26 15:11:03 -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
likho	58364a6c88	Update themes, use PUBNET instead of testnet	2023-07-26 16:19:40 +02:00
julian	759e5624e4	stop storing public coin	2023-07-25 15:11:34 -06:00
julian	c97de6017b	update lelantus coin schema	2023-07-24 16:44:12 -06:00
julian	df0b004b82	finish up basic migrate lcoins hive => isar	2023-07-24 12:30:01 -06:00
julian	a5ba67aa1d	WIP migrate lcoins hive => isar	2023-07-24 09:42:29 -06:00
likho	bbd070ba7f	Fix send	2023-07-22 10:24:41 +02:00
detherminal	e0df4723ae	feat: add xlm	2023-07-22 10:21:04 +02:00
ryleedavis	ee5a97c2fb	add monkey icon	2023-07-21 17:59:01 -06:00
julian	051fc7d1ef	Merge remote-tracking branch 'origin_SW/staging' into ordinals	2023-07-21 17:18:18 -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
julian	96bfafcd19	fix: contract decimal places bug for eth token amounts parsing	2023-07-20 15:13:56 -06:00
julian	895903b9ca	Merge branch 'ui-fixes' into ordinals	2023-07-19 11:03:29 -06:00
likho	022ce7ed34	Resolve merge conflicts	2023-07-19 17:00:48 +02:00
julian-CStack	d867270aac	exchange view amount string provider fix	2023-07-19 08:42:06 -06:00
likho	45af21dc27	Fix merge conflicts with staging	2023-07-19 16:37:54 +02:00
detherminal	d387fcc7b9	feat: update xtz	2023-07-19 16:21:13 +02:00
detherminal	0ae747aebc	feat: add xtz	2023-07-19 16:19:48 +02:00
julian	5b4a803215	add ordinals icon	2023-07-18 11:51:57 -06:00
julian	79670c5d47	WIP ordinal details view	2023-07-18 11:03:57 -06:00
julian	58c97de86c	WIP ordinal ui	2023-07-18 10:15:05 -06:00
julian-CStack	27c2f34a33	macos specific notifications fix	2023-07-17 10:36:45 -06:00
julian-CStack	27d97ebf49	number format hack/fix	2023-07-12 16:06:41 -06:00
julian	99b809ef17	fix: bch address book entry address validation	2023-07-11 08:51:28 -06:00
julian	87ed25bd5b	use relative path for theme assets	2023-07-03 18:25:18 -06:00
julian	b7b43e3380	close coin cache hive boxes when not in use	2023-07-03 16:27:36 -06:00
julian	69fabde3a5	fix hive box deletion	2023-07-03 15:12:24 -06:00
julian	6fb526efe5	self contained desktop password service refactor that does not keep its db open when not in use	2023-07-03 15:06:28 -06:00
julian	9513b203a9	refactor delete hive boxes in prep for hive->isar migration	2023-07-03 13:58:11 -06:00
julian	011ba6bf61	use theme brightness for simplex logo	2023-07-01 15:06:49 -06:00
julian	7b160b9a55	strip prefixes for cashaddrs before generating uris	2023-06-23 15:36:33 -06:00
julian	3a9f567150	fix: amount input formatter case when trying to input an amount less than one starting with a zero instead of the decimal separator, edge case allowing more decimal places than the coin has, and pasting certain amounts	2023-06-23 12:59:43 -06:00
julian	ccc9ac545a	clean up	2023-06-22 09:44:58 -06:00
detherminal	d04df00691	feat: update xtz	2023-06-21 14:29:28 +03:00
julian	f60dee0304	Merge remote-tracking branch 'origin_SW/staging' into custom_fee_selection	2023-06-19 10:09:16 -06:00
julian	0778deb6d3	feat: custom fee for sends on mobile for supported coins	2023-06-17 10:42:23 -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	f88d7f200c	fiat amount string formatting and parsing and more WIP usages thereof	2023-06-16 13:42:37 -06:00
julian	7bcfc87f4d	feat: amount string group separator based on locale and parse those formatted strings back to amounts based on localized decimal pattern	2023-06-16 10:43:20 -06:00
detherminal	f43aeadc3f	feat: add xtz	2023-06-12 22:03:32 +03:00
julian	ed120f552a	Merge branch 'ba_nano_fixes' into ui-fixes	2023-06-08 11:03:50 -06:00
ryleedavis	c4545c3eb0	rearrange coin order	2023-06-08 10:54:22 -06:00
julian	81970af4a4	correct mnemonic length displayed on new ba/nano wallet creation	2023-06-08 08:54:29 -06:00
julian	40d53f08c2	fix: coin enum order	2023-06-07 13:19:22 -06:00
julian	b6ed690eb6	fix: default coin units length and banano unit names	2023-06-07 13:17:49 -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
fossephate	5ac6df5d44	small fix	2023-05-30 19:29:33 -04:00
fossephate	3c524b2ea4	add banano support	2023-05-30 19:19:31 -04:00
julian	9c8101d3ea	fix: fake/mock clipboard getData	2023-05-30 10:41:53 -06:00
julian	774bfe517e	fix: missing eth case	2023-05-30 10:38:47 -06:00
julian	9c58df7cfd	default to less than 30 decimal places for nano	2023-05-30 10:02:41 -06:00
julian	91d330e57b	add nano support to AmountUnit	2023-05-30 09:32:17 -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
julian	388c60d016	fix: various amount unit issues	2023-05-30 09:02:09 -06:00
julian	4b6afe1db0	indicate loss of precision in displayed amounts	2023-05-29 17:13:45 -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	86cd5bea3e	feat: amount formatter and associated providers + prefs	2023-05-29 11:42:11 -06: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
detherminal	97e25a73be	docs: explain and comment code	2023-05-26 22:25:59 +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
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	bc868a7d38	fix: merge clean up	2023-05-24 12:08:32 -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	da522128de	fix: eCash display name	2023-05-24 10:51:57 -06:00
fossephate	7a95c20645	nano sending + minor sats constants refactor	2023-05-24 11:56:44 -04:00
julian	efd2742184	dev feat: pretty print json helper util	2023-05-23 09:36:55 -06:00
julian	69a850b9db	fix: anonymize more option icon	2023-05-19 16:44:57 -06:00
julian	b7619c3108	default to 12 word seeds for new wallets	2023-05-19 16:44:49 -06:00
julian	78d2627064	fix: assets display	2023-05-19 16:44:46 -06:00
detherminal	8f89f19b91	feat: add nano	2023-05-19 13:20:16 +03:00
julian	98ce9701a5	ecash from ticker fix	2023-05-18 08:23:42 -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
julian	a2c15ac332	fix: missing updated data version	2023-05-15 14:21:09 -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	127564f2ac	fix: bch remove bad address type	2023-05-15 07:48:50 -06:00
julian	63fff1d644	Add desktop custom theme selection and download ui. As well fixed a couple bugs on the mobile version	2023-05-12 09:32:35 -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	f8e6b060e6	encapsulate themes dir across platforms	2023-05-09 17:27:48 -06:00
julian	e53e7e5055	set up installing of themes and including default themes	2023-05-09 15:58:42 -06:00
julian	60af990c1f	remove a couple more hard coded assets	2023-05-09 14:59:21 -06:00
julian	136207c179	pull gifs out of bundled assets	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	0c305c4911	delete color theme files	2023-05-09 13:59:09 -06:00
julian	fae467440c	update text styles	2023-05-09 10:53:15 -06:00
julian	bd476a04a0	pass theme id	2023-05-09 10:24:37 -06:00
julian	efec395c79	fix: import	2023-05-09 10:24:11 -06:00
julian	789029a11f	some clean up of assets.dart	2023-05-09 10:23:39 -06:00
julian	236b895ae4	fix: delete themed assets from bundle and remove remaining references to assets.dart for themed icon assets	2023-05-09 09:21:04 -06:00
julian-CStack	f9f6d749ef	Merge remote-tracking branch 'origin_SW/staging' into themes	2023-05-08 10:55:11 -06:00
julian	3f5cfcbfaf	clean up unused code, imports, and formatting	2023-05-08 08:36:05 -06:00
julian	c8655d56bc	Merge remote-tracking branch 'origin_SW/staging' into custom_block_explorers	2023-05-08 08:20:52 -06:00
detherminal	47df2a8a7a	feat: use isar instead of hive	2023-05-05 20:30:22 +03:00
detherminal	1587b5b1e9	feat: implement custom block explorer	2023-05-04 21:10:37 +03:00
julian	032748fdfe	Merge branch 'staging' into trocador	2023-05-03 16:11:14 -06:00
ryleedavis	572410db89	resolve merge conflicts	2023-05-01 16:41:13 -06:00
ryleedavis	cede462681	WIP: randomize PIN provider + toggle added	2023-05-01 16:34:36 -06:00
julian	e81521e374	WIP exchange process refactor to handle multiple sub providers per exchange provider	2023-05-01 16:26:12 -06:00
julian	34f7d80051	Merge branch 'ui-fixes' into trocador	2023-05-01 13:50:27 -06:00
julian	35ea94a209	catch abi parsing errors	2023-05-01 11:18:38 -06:00
julian	808927a0d1	handle change in abi data	2023-05-01 08:51:55 -06:00
julian	e8cab19c47	WIP trocador assets and kyc info	2023-04-28 17:02:55 -06:00
julian	c9c9e79b5c	Merge branch 'ui-fixes' into themes	2023-04-27 17:07:04 -06:00
julian	61bb4b839d	paynym.is api debugging info	2023-04-25 15:08:24 -06: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
julian	dbc34168ef	arrow rotate svg clean up	2023-04-24 12:18:50 -06:00
julian-CStack	ec00f6aea4	WIP testing themes	2023-04-24 08:36:12 -06:00
ryleedavis	90ef8c8694	add arrow_rotate lottie	2023-04-21 12:18:59 -06:00
ryleedavis	15c2a8bb29	added boxShadowExt + boxShadows to ColorTheme	2023-04-21 09:57:20 -06:00
likho	3e36165db5	Add themes folder, setup json for dark theme assets and test getting assets from folder	2023-04-21 16:34:47 +02:00
julian	89cc47525d	new broadcast tx progress animation	2023-04-20 17:39:16 -06:00
julian-CStack	73261d85a5	Merge pull request #434 from InnocuousFinch/update-btc-blk-explr ... Update bitcoin block explorers to use mempool.space	2023-04-18 17:01:19 -06:00
julian-CStack	f6becfbe77	WIP re themeing	2023-04-18 10:46:04 -06:00
julian	9a6dcba631	Merge branch 'ui-fixes' into add-ecash	2023-04-17 15:55:09 -06:00
julian	8b76ef4f30	ecash derivation path	2023-04-17 12:58:34 -06:00
julian	148cd6f5b0	update decimals for eCash	2023-04-17 12:56:35 -06:00
ryleedavis	95f16ec250	add chan persona images	2023-04-17 09:56:51 -06:00
julian-CStack	93b040bc5f	WIP e-cash	2023-04-17 07:53:39 -06:00
julian	49b6e65ffe	remove a couple default tokens	2023-04-13 09:17:05 -06:00
julian	b5a58064ac	eth gas tracker fixes and token send tweaks	2023-04-11 15:36:37 -06:00
julian	7ee5c196a0	token theme colors	2023-04-10 12:00:23 -06:00
julian	94896dfd60	Amount fixes	2023-04-06 17:49:13 -06:00
julian	16a6619746	remove fromDouble constructor from amount due to possible precision errors	2023-04-06 17:30:33 -06:00
julian	ae51ce61c3	amount unit + tests	2023-04-06 17:27:42 -06:00
julian	25ff880280	move amount.dart file	2023-04-06 15:24:56 -06:00
julian	14d68b0743	Amount tweaks and fixes	2023-04-06 14:21:49 -06:00
julian	ecc075d5fc	Merge remote-tracking branch 'origin/staging' into add-ethereum ... # Conflicts: # lib/utilities/theme/forest_colors.dart	2023-04-06 12:42:05 -06:00
ryleedavis	81009d0023	corrected nav text colors	2023-04-05 17:03:18 -06:00
ryleedavis	05eb6bd20d	set text color for wallet nav	2023-04-05 16:58:27 -06:00
ryleedavis	848336bb07	fix send/receive icon colors for wallet nav bar	2023-04-05 16:45:33 -06:00
ryleedavis	9ebc7287c6	fixed orange theme on start up instead of oled black	2023-04-05 16:28:48 -06:00
julian	81c612ddd7	WIP use Amount	2023-04-05 16:06:31 -06:00
julian	2936c1b807	Amount refinements	2023-04-04 10:47:36 -06:00
julian	a9306e5267	use EthTokenIcon class	2023-04-03 16:38:48 -06:00
julian	5e5b3100c4	add uniswap to default eth tokens	2023-04-03 15:27:36 -06:00
julian	563799feee	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-04-03 10:37:51 -06:00
julian	c7930ba32f	Merge remote-tracking branch 'origin/staging' into ui-fixes	2023-04-01 08:58:24 -06:00
ryleedavis	ff94875497	add orange theme selector + edit svgs	2023-03-31 21:43:21 -06:00
ryleedavis	2a1a5e858c	add orange theme colors	2023-03-31 16:14:28 -06:00
julian	c8139007e3	use new transaction nonce property	2023-03-31 10:18:51 -06:00
julian	a04223e0b7	eth gas tracker updated	2023-03-30 14:55:51 -06:00
julian	f0d414bc86	formatting clean up	2023-03-30 12:26:19 -06:00
julian	8452758d17	added extra Amount functionality + tests	2023-03-30 10:49:07 -06:00
julian	bfeb3e0d30	WIP eth fees	2023-03-29 12:49:12 -06:00