821 commits

Author	SHA1	Message	Date
sneurlax	a6c793bdb9	add Show xPub dot option on desktop	2023-04-05 16:39:39 -05:00
julian	57ac4d4747	desktop eth token send view fixes	2023-04-04 09:12:21 -06:00
julian	36c4221185	WIP desktop eth token send view	2023-04-03 21:11:10 -06:00
julian	e01cef5df7	desktop token receive view update	2023-04-03 20:27:46 -06:00
julian	96aa10653b	desktop main view wallets overview table list tweaks	2023-04-03 20:19:41 -06:00
julian	53a4d8a4cd	desktop show more button fix	2023-04-03 18:41:06 -06:00
julian	728909399c	WIP desktop token view	2023-04-03 17:05:48 -06:00
julian	6e5cffa4d4	desktop show more button fix	2023-04-03 16:37:20 -06:00
julian	c530aef112	redo desktop enter wallet gui	2023-04-03 16:22:40 -06:00
julian	ce7b222fa1	use main db provider	2023-04-03 10:55:10 -06:00
julian	5d1ee78452	Merge branch 'ui-fixes' into add-ethereum	2023-04-03 10:38:02 -06:00
julian	563799feee	Merge remote-tracking branch 'origin/staging' into add-ethereum	2023-04-03 10:37:51 -06:00
julian	6c26820ee4	unused provider cleanup	2023-04-03 10:36:46 -06:00
julian	ec3a5aefec	desktop orange theme selector image fix	2023-04-03 10:27:18 -06:00
julian	a92040194a	desktop address list	2023-04-03 10:10:54 -06:00
julian	75bfad3471	desktop address list card styling	2023-04-02 13:48:14 -06:00
julian	afea310ba4	WIP desktop address list	2023-04-02 13:21:59 -06:00
julian	72a170433d	refactor and add address list button to desktop wallet options pop up menu	2023-04-02 11:50:15 -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
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	e29d8dc047	Merge remote-tracking branch 'origin/staging' into add-ethereum ... # Conflicts: # lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart	2023-03-27 08:50:10 -06:00
julian	2fbb2a1e46	hide exchange reference if exchange not available	2023-03-25 18:48:46 -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
sneurlax	768c51c03b	Revert "disable wownero on desktop and xmr on windows" ... But still disable on windows This reverts commit 0062294488	2023-03-23 18:36:24 -05:00
julian	ddc3e2191f	hide system brightness toggle on desktop for now	2023-03-22 13:36:36 -06:00
julian	9fa2d4535d	merge fixes	2023-03-22 09:25:21 -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	891f15cd58	choose custom themes to set based on the system's light/dark brightness	2023-03-20 18:04:05 -06:00
julian	75ea516005	system brightness toggle WIP	2023-03-20 16:02:20 -06:00
julian	9340f4a45d	dark chans	2023-03-20 09:46:23 -06:00
julian	3963f29318	chans theme desktop selector fix and padding fixes	2023-03-17 13:12:09 -06:00
julian	db1f5f622f	WIP chans theme	2023-03-17 11:44:30 -06:00
julian	67e7e6e421	certain svg asset precache	2023-03-17 10:47:38 -06:00
julian	e6119d82bb	clean up last conditional png/svg switches	2023-03-17 09:07:34 -06:00
julian	43f2fd7e77	chan theme and assets clean up	2023-03-17 08:57:40 -06:00
julian	62287f6aee	desktop exchange+buy nav from wallet	2023-03-16 14:53:14 -06:00
julian	e58bdf68c8	desktop balance toggle	2023-03-16 13:56:44 -06:00
julian	9e0bd2aa35	add optional dropdown prefix label	2023-03-16 12:22:57 -06:00
julian	6f7f9c24eb	desktop coin control	2023-03-16 12:10:59 -06:00
julian	6c1d9d2912	WIP desktop send view coin control	2023-03-15 12:01:10 -06:00
julian	8838f68524	add coin control prefs setting to desktop	2023-03-15 09:56:02 -06:00
julian	4be2bd6fcd	freeze button fix	2023-03-15 09:48:39 -06:00
julian	94d9022f3d	desktop UTXO clear selection button	2023-03-14 16:56:26 -06:00
julian	10c5575a9e	multi select freeze/unfreeze utxos on desktop	2023-03-14 16:50:01 -06:00
julian	da011543b8	desktop coin control search, filter, and sort	2023-03-14 16:28:24 -06:00
julian	c0ce75918c	selectable utxo row data	2023-03-14 10:26:35 -06:00
julian	f79fe222a2	don't clear desktop send fields on send all confirm	2023-03-14 09:46:50 -06:00
julian	f6c939bf6e	lottie min time mod	2023-03-14 09:43:54 -06:00
julian	b2ce88e33d	WIP desktop utxo details	2023-03-13 17:09:14 -06:00
julian	397112e0c9	basic desktop coin control layout	2023-03-13 16:41:53 -06:00
julian	8b9ad5e263	'more' clean up and added skeleton coin control view	2023-03-13 15:50:29 -06:00
julian	d0be86f4ba	WIP desktop 'more features' and coin control	2023-03-13 14:37:05 -06:00
julian	87c15c2c39	add lottie animations for sending as well as some clean up	2023-03-13 13:16:48 -06:00
julian	b969987404	rename exchange to swap	2023-03-10 16:01:34 -06:00
sneurlax	60ab907c28	strip / suffix	2023-03-07 14:55:28 -06:00
sneurlax	e4a9895120	strip mailto: prefix	2023-03-07 14:55:22 -06:00
sneurlax	e98ad2971a	rename address-formatting function	2023-03-07 14:55:05 -06:00
sneurlax	c65bd649d9	desktop: listen to text field change, strip http/s:// if contains @	2023-03-06 17:25:03 -06:00
julian-CStack	d97a994c54	desktop sizing fixes	2023-03-05 12:35:26 -06:00
julian-CStack	e8e8ffdf60	Merge branch 'staging' into mb-fixes	2023-03-03 15:15:58 -06:00
julian	58227c40be	mb order status fixes	2023-03-03 11:56:21 -06:00
julian	16efeea1db	project structure	2023-03-01 15:52:13 -06:00
ryleedavis	d33cc34970	oceanBreeze persona-easy/incognito	2023-02-27 13:32:50 -07:00
julian	d8096fdf93	Merge branch 'ui-fixes' into paynyms ... # Conflicts: # pubspec.yaml	2023-02-21 16:41:06 -06:00
ryleedavis	c5e3a0ddb6	persona-easy/incognito pngs for fruitSorbet and oceanBreeze theme	2023-02-14 12:59:34 -07:00
ryleedavis	c37ec4fb81	fruit and ocean easy/incognito pngs + ocean stack img	2023-02-14 11:33:11 -07:00
julian	fbeb7425cb	Merge remote-tracking branch 'origin/ui-fixes' into paynyms	2023-02-13 17:24:04 -06:00
ryleedavis	d5847ae25e	move persona-easy/incognito to theme files	2023-02-13 15:24:09 -07:00
julian	9f3ce454b5	only delete logs older than 30 days automatically	2023-02-13 15:08:38 -06:00
julian	30ea666a63	added desktop file save logs dialog todo	2023-02-13 14:12:54 -06:00
julian	69782a1bb2	sort wallet coins alphabetically	2023-02-13 12:35:40 -06:00
julian-CStack	54dba90825	Merge branch 'staging' into ui-fixes	2023-02-10 14:22:00 -06:00
sneurlax	44074428a9	Merge branch 'staging' into ui-fixes	2023-02-10 13:55:58 -06:00
julian	d5f401132b	Desktop paynym ui and some bug fixes	2023-02-10 12:07:57 -06:00
sneurlax	81c7b9f244	Merge branch 'themescroller' into ui-fixes	2023-02-10 11:35:59 -06:00
sneurlax	23bb519874	Merge branch 'favoritefavorite' into ui-fixes	2023-02-10 11:35:39 -06:00
julian	218017ca51	populate initial values in exchange form	2023-02-10 08:04:12 -06:00
sneurlax	8cd431a71c	key favorite cards ... and what Julian's already done automagically reorders the cards according to their order in the list in the edit view so you can list which favorite is your favorite	2023-02-09 18:00:15 -06:00
sneurlax	7a4832e873	wrap theme column in SingleChildScrollView ... is this... it? surely not. surely we need more than this	2023-02-09 17:49:42 -06:00
ryleedavis	d1f22cdc06	prep for adding in forest theme colors	2023-02-09 14:37:25 -07:00
julian	2eb0b2e123	clean up exchange rate type enum, build runner mocks	2023-02-08 16:46:30 -06:00
julian	5c29a543a9	reduce unneeded providers	2023-02-08 14:22:22 -06:00
julian	8206972309	add loading screen if not exchange data cache exists while waiting for it to be populated for the first time. Added checks for incognito mode	2023-02-08 08:43:42 -06:00
julian	998967245e	migrate wallet on open	2023-02-08 07:29:27 -06:00
julian	1455808d7a	WIP refactor exchange to use isar as cache instead of in memory using riverpod	2023-02-05 14:32:39 -06:00
julian	bcb8f2cd41	"choose from stack" fixes	2023-01-31 08:41:40 -06:00
julian	69435f4807	rename and fix text button style update bug	2023-01-30 15:34:21 -06:00
julian	26c57b5456	typecast to generic PaynymWalletInterface	2023-01-26 10:59:15 -06:00
julian	5de22ca858	Merge branch 'simplex' into paynyms	2023-01-26 10:16:01 -06:00
julian	ffda21f513	desktop xmr/wow single wallet opening bug fix	2023-01-26 09:20:49 -06:00
julian	cbf969ef54	desktop xmr/wow single wallet opening bug fix	2023-01-25 17:42:20 -06:00
sneurlax	deb845db3b	linting	2023-01-25 16:43:21 -06:00
julian	7cb497f4f7	remove coin enum hasPaynymSupport getter in favor of type checking	2023-01-25 15:46:48 -06:00
julian	9c44dc6c6b	add support to make adding segwit paynym support simple once implemented	2023-01-25 14:33:59 -06:00
sneurlax	07247a46b9	Merge remote-tracking branch 'cypherstack/ui-fixes' into simplex	2023-01-24 13:49:14 -06:00
julian	028b261dee	refactor button style getter names	2023-01-24 13:29:12 -06:00
sneurlax	ab1ff2604a	import logger, lint imports	2023-01-24 13:12:56 -06:00
sneurlax	32ca83673a	Merge remote-tracking branch 'cypherstack/ui-fixes' into simplex	2023-01-24 12:29:13 -06:00
julian	e404de2116	force usage of adkVersion parameter	2023-01-24 10:30:00 -06:00
julian	7d10ae2011	go directly to wallet view on single wallet per coin on desktop and mobile	2023-01-24 10:16:44 -06:00
ryleedavis	7fe1fefea2	Merge remote-tracking branch 'origin/isar_migrate' into ui-fixes	2023-01-23 17:31:24 -07:00
ryleedavis	d25b757a22	add fruit sorbet to mobile + desktop appearance settings	2023-01-23 11:00:46 -07:00
sneurlax	824b3bb9a7	pushNamed navigation route, WIP	2023-01-20 20:32:57 -06:00
julian	830fd58754	Merge branch 'isar-transactions' into isar_migrate ... # Conflicts: # lib/services/coins/bitcoin/bitcoin_wallet.dart # lib/services/coins/bitcoincash/bitcoincash_wallet.dart # lib/services/coins/coin_service.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/monero/monero_wallet.dart # lib/services/coins/namecoin/namecoin_wallet.dart # lib/services/coins/particl/particl_wallet.dart # lib/services/coins/wownero/wownero_wallet.dart # pubspec.yaml	2023-01-20 15:30:48 -06:00
julian	cd4408449c	desktop db migrate enabled	2023-01-18 08:07:25 -06:00
julian	90870c7563	wallet delete ui bugfix for desktop	2023-01-16 17:17:35 -06:00
julian	5562c14527	WIP refactor to single main isar db	2023-01-16 15:04:03 -06:00
julian	89778e6e63	disable BuyDataLoadingService	2023-01-14 11:22:48 -06:00
sneurlax	61c971973c	restyle coin and fiat selection widgets ... and: - available -> supported - do not load simplex data on desktop menu item action	2023-01-13 13:14:56 -06:00
julian	0543c4b044	filter by address fixes	2023-01-13 12:00:02 -06:00
sneurlax	eaaed8a638	linting	2023-01-12 14:16:03 -06:00
sneurlax	abcb473bfa	update desktop menu controller indices	2023-01-12 14:13:49 -06:00
sneurlax	dad7329a30	load buy data when clicking buy crypto item in desktop menu	2023-01-12 14:13:29 -06:00
julian	525d0fa7c4	update remaining ui to handle new data models	2023-01-11 22:45:32 -06:00
julian	f8c6a17fa7	update wallet ui to handle new data models	2023-01-11 22:26:38 -06:00
sneurlax	8e8816fe05	first simplex service stash	2023-01-11 18:13:34 -06:00
sneurlax	9724b40848	add fiat crypto toggle and crypto selection list	2023-01-11 11:19:19 -06:00
sneurlax	30ea0cc24f	change desktop menu item text to reflect figma design	2023-01-10 15:20:41 -06:00
ryleedavis	79f2cc0768	wrap funct on desktop theme selectors	2023-01-06 09:35:41 -07:00
ryleedavis	23e3452cf1	oledBlack theme added to desktop	2023-01-06 09:12:01 -07:00
ryleedavis	0a810987c0	oledBlack added to textStyles and appearance settings	2023-01-05 13:34:56 -07:00
sneurlax	0ee2357c60	add basic buy page	2023-01-04 10:51:38 -06:00
julian	805beb109f	package imports	2023-01-04 10:08:36 -06:00
julian	f4729526e6	initial desktop paynym ui set up and state provider refactor	2023-01-04 09:41:25 -06:00
julian	0062294488	disable wownero on desktop and xmr on windows	2023-01-02 13:16:59 -06:00
julian	57add19e88	do not partially open monero wallets at the same time on startup	2023-01-02 09:13:00 -06:00
ryleedavis	2765bea4a9	Merge branch 'staging' into ui-fixes	2022-12-30 17:27:31 -07:00
julian-CStack	5f71a1c2dd	more bug fixes (#281) ... * xmr send fix * small screen recovery phrase warning view fix * mnemonic field crashes fix * desktop restore date fix * mac desktop keyboard type crash fix * firo (and possibly other) send fix * key fix for duplicate wallets edge case	2022-12-30 17:10:25 -06:00
ryleedavis	ed486f7c16	fixed attention delete wallet dialog text typos	2022-12-28 12:07:00 -07:00
ryleedavis	172883532c	delete wallet attention dialog text	2022-12-28 11:55:42 -07:00
shillo	f85d2895fc	windows reset password DPS error fix	2022-12-23 14:21:37 -06:00
shillo	c6dd9394be	fix exit button on windows	2022-12-23 13:29:03 -06:00
shillo	951cc044cb	temp disable git versions	2022-12-22 16:59:54 -06:00
ryleedavis	096d2c007e	Merge branch 'desktop' of https://github.com/cypherstack/stack_wallet into desktop	2022-12-14 13:56:13 -07:00
ryleedavis	390623560e	debugPrints that aren't needed ?	2022-12-12 17:17:02 -07:00
julian	84108a3b27	use system navigator to exit	2022-12-09 15:50:17 -06:00
julian	5ed5e6e8ef	weird locale error temp fix	2022-12-09 15:41:56 -06:00
julian	133e8c388c	possible macos ipad delete fix	2022-12-06 13:57:11 -06:00
julian	252115e12c	recursive deletion fix	2022-12-06 12:20:03 -06:00
julian	b431ac89a6	ios on macos password reset deletion fix	2022-12-06 11:04:02 -06:00
julian	a236d72846	don't show fee selection for epic	2022-12-06 08:36:03 -06:00
julian	4593f7a0dc	fix desktop wallet name field	2022-12-05 16:36:28 -06:00
julian	4559269784	add restore wording	2022-12-05 16:14:16 -06:00
julian	ef8f38aeb8	fix wallets not showing up when more than 1 of the same type are created	2022-12-05 16:10:18 -06:00
julian	7436709fa7	desktop forgot password flow and functionality	2022-12-05 13:55:50 -06:00
julian	1d764c13e9	desktop theme fixes	2022-12-01 10:14:59 -06:00
julian	3ff0e9dd81	desktop code file structure refactor	2022-12-01 08:48:23 -06:00
julian	69ec8a40d2	desktop send from stack step 4 fix	2022-12-01 08:30:41 -06:00
julian	788ae6fac1	desktop trade steps indicator transitions	2022-12-01 08:27:05 -06:00
julian	779bf20cc4	desktop trade steps flow fade transition and state management updates	2022-11-30 15:23:26 -06:00
julian	7641539bf7	move tx note field to confirm tx page on desktop	2022-11-30 11:36:58 -06:00
julian	93e44a4475	close button on desktop exchange step 4	2022-11-30 11:18:46 -06:00
julian	e0f757f0bc	desktop show wallet name instead of "Current receiving" for My Stack contact address details labelling	2022-11-30 08:55:58 -06:00
julian	c4a0a6ea94	debug print clean up	2022-11-30 08:24:10 -06:00
julian	4eca159a19	desktop send receive animation effects	2022-11-30 08:23:56 -06:00
julian	2476aa4d1f	trade details scroll on small desktop screens	2022-11-29 14:56:14 -06:00
julian	4c45487e6e	desktop all trades view	2022-11-29 13:31:48 -06:00
julian	37bacf8c7f	desktop delete wallet passphrase field text height fix	2022-11-29 12:23:24 -06:00
julian	1623a4a63c	desktop notifications icon fix	2022-11-29 11:56:56 -06:00
julian	9aadf1d80f	desktop trade history fix	2022-11-29 11:04:14 -06:00
julian	ac1a0af265	fix display bug not showing contacts without addresses	2022-11-29 10:45:48 -06:00
julian	1aca715397	animated desktop menu fix	2022-11-28 16:17:33 -06:00
julian	18da658a65	persist active wallet on desktop	2022-11-28 16:02:26 -06:00
julian	d7cd5cb8a9	desktop wallets table hover effects	2022-11-28 15:37:57 -06:00
julian	c3921b01de	animated desktop stack icon	2022-11-28 14:25:57 -06:00
julian	221e654dd6	animated main menu	2022-11-28 13:51:05 -06:00
ryleedavis	76e0616ade	view backup keys text changed for wallet deletion	2022-11-28 10:40:45 -07:00
julian	05bdc8c52f	fix node loading on initial start for desktop, only add default node back if there are no nodes exist for a certain coin	2022-11-25 13:50:13 -06:00
julian	42aad5dcd5	themed background gradient option and background image, as well as various button height fixes for mobile	2022-11-25 13:24:01 -06:00
julian	286f6a552b	desktop send to coin ticker fixed	2022-11-24 18:22:45 -06:00
julian	adee71224b	Format coin amounts improvements, fixed fee rates display issue, use hard coded xmr estimates for now	2022-11-23 12:42:23 -06:00
ryleedavis	7011c6e1f6	submit on enter for wallet keys	2022-11-23 08:01:58 -07:00
julian	67d375dbd5	desktop new notifications bell icon indicator	2022-11-22 16:37:47 -06:00
julian	467d43d9f3	desktop trade history scroll fix	2022-11-22 16:18:38 -06:00
julian	a8b0901ec6	desktop exchange navigation flow fix	2022-11-22 15:32:06 -06:00
ryleedavis	9a47ce349e	submit on enter passphrase	2022-11-22 11:53:57 -07:00
ryleedavis	c5c0443d00	button sizing fix	2022-11-22 11:53:57 -07:00
julian	0bdf337ffb	WIP send from stack desktop trade transaction navigation	2022-11-22 11:21:43 -06:00
julian	6552fc913d	WIP send auth for trade transactions	2022-11-22 09:11:18 -06:00
julian	7afe6940f9	desktop trade history details updated	2022-11-22 08:07:22 -06:00
julian	b32e15a3ea	desktop login on enter pressed	2022-11-22 07:13:03 -06:00
ryleedavis	6384d66308	added delays for floatingFlushBar in settings change password	2022-11-21 20:34:36 -07:00
ryleedavis	675977c787	copy to clipboard added to wallet keys dialog	2022-11-21 20:33:38 -07:00
ryleedavis	7a650c78d3	loading indicator and delay for wallet keys	2022-11-21 15:17:26 -07:00
ryleedavis	a10958b12d	delete popup rounded corner fix	2022-11-21 15:08:48 -07:00
julian	c935c590c7	desktop exchange flow tweaks and show QR code	2022-11-21 16:00:12 -06:00
ryleedavis	e099089d04	loading indicator and delay	2022-11-21 14:58:03 -07:00
ryleedavis	66950ccc50	delete popup styled	2022-11-21 14:40:11 -07:00
julian	f75e4ea2fa	desktop delete routing fixes	2022-11-21 14:52:41 -06:00
julian	04b982fb25	desktop exchange choose from stack address ui	2022-11-21 13:22:02 -06:00
julian	7e8f0db967	long address layout fix	2022-11-21 13:22:02 -06:00
julian	3fca3d8b1e	desktop exchange flow styling and choose addresses from addressbook functionality	2022-11-21 13:22:02 -06:00
julian	3e9039ac90	show to and from tickers in exchange steps flow	2022-11-21 13:22:02 -06:00
ryleedavis	5c7cb8a3c5	WIP: unmounted widget	2022-11-21 12:18:35 -07:00
ryleedavis	78186358b9	WIP: wallet will be deleted dialog	2022-11-21 10:51:15 -07:00
julian	c9e2c4abb7	desktop trade steps 3 and 4 mostly laid out	2022-11-21 10:14:27 -06:00
julian	648c896b9e	refactor desktop step item	2022-11-21 09:51:39 -06:00
julian	2654d50e40	populate desktop step two trade info	2022-11-21 09:41:16 -06:00
julian	11845b8b05	populate desktop step one trade info	2022-11-21 09:23:11 -06:00
julian	b22b4195d6	desktop exchange steps scaffolding	2022-11-21 09:15:13 -06:00
julian	e2a172f747	firo private/public balance desktop toggle	2022-11-19 18:04:53 -06:00
julian	601001f96d	WIP: desktop exchange steps flow ui	2022-11-19 13:20:03 -06:00
julian	b2ff99be19	login loading indicator size	2022-11-19 13:20:03 -06:00
ryleedavis	5f1a485ed5	WIP: delete wallete stateful widget + attention warning dialog	2022-11-19 11:00:15 -07:00
ryleedavis	92da601fb8	WIP: delete wallete Attention dialog	2022-11-18 17:43:35 -07:00
ryleedavis	8080272738	WIP: delete wallet	2022-11-18 16:19:38 -07:00
julian	e665926b1b	firo anonymize navigation fix	2022-11-18 16:06:38 -06:00
julian	ea143d9ffa	basic desktop exchange layout	2022-11-18 13:08:20 -06:00
julian	7ef31cbf87	add back exchange menu option and adjust icon color	2022-11-18 13:08:20 -06:00
ryleedavis	792b91b7c4	syncing pref options show on button press + shows card w current syncing prefs	2022-11-18 11:27:04 -07:00
ryleedavis	8207474d09	ocean breeze selector + functionality added	2022-11-18 09:30:31 -07:00
julian	4d17c1db5f	addressbook filter coins list fix	2022-11-18 10:22:43 -06:00
julian	d4b7ec0f17	desktop edit contact	2022-11-18 10:22:43 -06:00
julian	07f229f2a0	refactor popup	2022-11-18 10:22:43 -06:00
julian	aa966a106d	add delete contact functionality for desktop	2022-11-18 10:22:43 -06:00
julian	390c3f186f	temporarily disable in wallet exchange button	2022-11-17 18:49:56 -06:00
julian	e70f5b0709	WIP desktop contact options context popup menu	2022-11-17 18:14:39 -06:00
julian	df64e48e1e	desktop add new contact address entry	2022-11-17 18:14:39 -06:00
julian	cd19d776ae	desktop edit contact address entry	2022-11-17 18:14:39 -06:00
ryleedavis	318758f768	copy receive address has pointer finger cursor	2022-11-17 16:55:34 -07:00
julian	4948493643	contact tx history	2022-11-17 16:18:07 -06:00
julian	51c98f90e9	contact tx history	2022-11-17 16:18:07 -06:00
julian	8799a9cfa2	my stack contact tweaks	2022-11-17 16:18:07 -06:00
ryleedavis	682966dab8	desktop block explorer dialog	2022-11-17 14:08:06 -07:00
julian	95a9fade38	desktop contact address details	2022-11-17 12:17:55 -06:00
julian	1d238c29f0	WIP: centralize button heights	2022-11-17 12:01:52 -06:00
julian	9e7c1ccf9d	button size enum	2022-11-17 11:46:52 -06:00
ryleedavis	9063749ead	anonymize button added to firo wallet	2022-11-17 10:42:18 -07:00
julian	81d5f757b3	WIP: desktop contact details	2022-11-17 11:10:26 -06:00
julian	b6e4357c3c	wallet overview syncing/loading balance text color fix for darkmode	2022-11-17 10:23:12 -06:00
julian	df810c2a14	"send from" contacts fix	2022-11-17 10:12:38 -06:00
julian	72248d6a64	expandable fix	2022-11-17 10:12:19 -06:00
julian	8c0a6f5669	address book search fixes	2022-11-17 09:04:54 -06:00
julian	49103c86f1	desktop addressbook layout fix	2022-11-17 09:00:10 -06:00
julian	7cc3c71b0d	desktop addressbook search	2022-11-17 07:22:53 -06:00
ryleedavis	2936249bd6	textfields clear on send	2022-11-16 16:36:50 -07:00
ryleedavis	bd0b01efcd	desktop debug shows search bar when scrolling	2022-11-16 15:51:49 -07:00
ryleedavis	5f863bb35a	QR button on desktop Send commented out	2022-11-16 13:18:32 -07:00
ryleedavis	dfc52e3e7e	unsuccessful login lag fixed	2022-11-16 12:29:59 -07:00
julian	0ce2477cf8	desktop addressbook layout	2022-11-16 12:08:19 -06:00
julian	c50b2054fe	no notifications fix	2022-11-16 11:23:42 -06:00
ryleedavis	bfc1603197	fixed setting container corner rounding and padding	2022-11-16 08:11:25 -07:00
julian	cebbfcf82d	desktop currency update on save only	2022-11-15 17:45:16 -06:00
julian	07cf1f3f92	Add MouseRegion to Expandable widget and clean up duplications	2022-11-15 16:44:43 -06:00
ryleedavis	b4488fceed	US spelling adjustment	2022-11-15 15:42:06 -07:00
julian	1818b00ac6	slightly adjust mouse region	2022-11-15 16:29:22 -06:00
ryleedavis	3eae7d0fab	password eye icon pointer cursor	2022-11-15 15:23:32 -07:00
ryleedavis	19d070c618	send/receive pointer finger on hover	2022-11-15 15:00:07 -07:00
ryleedavis	824d803678	cursor on hover of wallet	2022-11-15 14:54:51 -07:00
ryleedavis	a57651a766	layout fix + correct currency description	2022-11-15 14:54:51 -07:00
julian	6cfbeb180e	desktop nodes search	2022-11-15 15:52:57 -06:00
julian	1afc468d28	desktop nodes scroll layout fix	2022-11-15 15:52:57 -06:00
ryleedavis	f11119119a	changed all settings buttons to PrimaryButton	2022-11-15 14:32:44 -07:00
ryleedavis	aead30504e	alignment for settings pages icons	2022-11-15 14:13:16 -07:00
julian	5211617082	WIP desktop fee dropdown	2022-11-15 14:56:15 -06:00
julian	a48975940d	desktop wallet keys and net info button highlight	2022-11-15 14:56:15 -06:00
julian	d326c10f42	desktop login loading indicator	2022-11-15 14:56:15 -06:00
ryleedavis	8adec7ba5c	auto frequency dark mode text fix	2022-11-15 12:29:08 -07:00
ryleedavis	4a90856498	WIP: node settings scrollable	2022-11-15 12:12:38 -07:00
ryleedavis	e0555f53a4	WIP: desktop address book displays contacts	2022-11-14 19:27:42 -07:00
julian	9df0569bb1	add passphrase check before displaying wallet seed	2022-11-14 13:35:14 -06:00
julian	e053764554	basic desktop change passphrase functionality	2022-11-14 13:27:01 -06:00
julian	bdf1008424	desktop edit auto swb functionality	2022-11-14 13:27:01 -06:00
julian	29ec03fb87	disable swb auto backup desktop popup	2022-11-14 13:25:44 -06:00
ryleedavis	e91c99883b	edit auto backup navigation route error	2022-11-14 11:43:00 -07:00
ryleedavis	f46c0dacf9	fixed desktop sizing error	2022-11-14 11:32:26 -07:00
julian	ceaaa0a4f0	linter warning clean up and update process dialog popups	2022-11-14 11:25:34 -06:00
julian	60bdc6151b	desktop notifications view	2022-11-14 10:40:31 -06:00
julian	7cf3a8efba	refactor desktop main menu and add WIP notifications view	2022-11-14 09:50:58 -06:00
julian	daa7708ad0	temp disable exchange option for desktop	2022-11-14 09:20:35 -06:00
julian	4238ce338a	desktop password protected send flow	2022-11-14 09:05:45 -06:00
julian	94709623c4	temp firo balance dropdown	2022-11-14 07:37:24 -06:00
julian	649e7c6a0b	Merge remote-tracking branch 'origin/desktop' into desktop	2022-11-12 16:59:57 -06:00
julian	0164679cce	File system path clean up	2022-11-12 16:07:57 -06:00
ryleedavis	ca6578d367	desktop address book filter dialog	2022-11-12 11:10:46 -07:00
julian	d8b71579e3	Merge remote-tracking branch 'origin/desktop' into desktop-testing	2022-11-12 09:52:46 -06:00
ryleedavis	7798ed39a0	desktop address book with no contacts	2022-11-11 15:58:47 -07:00
ryleedavis	d084fac057	password progressbar fix	2022-11-11 12:42:04 -07:00
ryleedavis	6ce899cd27	textfields for desktop change password	2022-11-11 12:27:39 -07:00
julian	bfe1b7e291	Merge branch 'desktop' into desktop-testing ... # Conflicts: # lib/pages/settings_views/global_settings_view/stack_backup_views/restore_from_file_view.dart	2022-11-11 13:23:24 -06:00
julian	f7bf624028	initialize store on successful password creation	2022-11-11 12:37:44 -06:00
ryleedavis	de896d30bc	desktop dialog for disable auto backup	2022-11-10 22:14:08 -07:00
ryleedavis	5f106efa4b	desktop edit auto backup and enabled/disabled button	2022-11-10 15:11:17 -07:00
julian	7105deeb24	initialize isar instance correctly for desktop secure wrapper	2022-11-10 15:40:23 -06:00
julian	a50520b37f	WIP: desktop password login and auth flow	2022-11-10 12:40:16 -06:00
julian	27b6f79b22	Merge remote-tracking branch 'origin/desktop' into desktop-testing	2022-11-10 10:33:51 -06:00
ryleedavis	74a0475076	WIP: desktop restore dialog displays	2022-11-10 09:09:28 -07:00
julian	3ee0e97628	DesktopSecureStore implementation using Isar as backend, renamed FlutterSecureStorageInterface	2022-11-09 17:55:34 -06:00
julian	2bdf5f152c	dynamic secure storage provider	2022-11-09 17:55:34 -06:00
ryleedavis	6d0452debb	small import fix	2022-11-09 16:23:53 -07:00
ryleedavis	cc779be460	enable and disable auto back up	2022-11-09 15:32:39 -07:00
ryleedavis	61f945aa98	dialog uses BackupFrequencyTypes and has offset for dropDownButton	2022-11-09 13:13:42 -07:00
ryleedavis	041e23a5a5	resolved route_generator conflict	2022-11-09 08:57:41 -07:00
julian	97b4407957	desktop forgot password ui	2022-11-08 15:38:53 -06:00
julian	cede571350	desktop login/password screen	2022-11-08 15:38:53 -06:00
ryleedavis	95716bd0f6	added textfield functionality to desktop create auto backup	2022-11-08 12:15:38 -07:00
ryleedavis	543f9631d8	changed desktop textbox fontsize	2022-11-08 12:15:38 -07:00
ryleedavis	43deb9f81f	desktop about ui fix	2022-11-08 12:15:38 -07:00
julian	2f6b1278fe	swb desktop layout tweaks	2022-11-07 16:30:17 -06:00
julian	3c627a5ddb	support tweak	2022-11-07 15:57:04 -06:00
julian	b3a343d28a	desktop theme toggle	2022-11-07 15:48:27 -06:00
ryleedavis	48a0e3a5ca	desktop about view added	2022-11-07 12:32:04 -07:00
ryleedavis	9fe9ee3a12	desktop about view route added	2022-11-07 12:32:04 -07:00
ryleedavis	dbb2b309ca	blue link text added to desktop	2022-11-07 09:15:02 -07:00
ryleedavis	1e61a779ec	desktop support view route added	2022-11-07 08:15:44 -07:00
ryleedavis	e06910a34a	WIP: theme change	2022-11-04 17:50:51 -06:00
julian	4dd8ae23c5	WIP: desktop password	2022-11-04 17:42:45 -06:00
ryleedavis	ac0d4191c6	added button widgets and some containers to restore dialog	2022-11-04 16:34:36 -06:00
ryleedavis	905e396a17	implemented clear logs on press	2022-11-04 14:21:09 -06:00
ryleedavis	2c935d65b6	WIP: showing textfields for backups	2022-11-04 14:19:53 -06:00
julian	bed25b37f7	desktop node management ui	2022-11-03 18:12:07 -06:00
ryleedavis	eb49ee0a2b	Merge branch 'staging' into desktop	2022-11-03 17:57:52 -06:00
ryleedavis	e5f69700f7	conditional for desktop syncing pref settings	2022-11-03 14:28:24 -06:00
julian	66ead82462	node settings desktop stuff and some code cleanup	2022-11-03 12:26:24 -06:00
julian	dc4e7f4bae	shared currency settings code	2022-11-03 11:04:57 -06:00
ryleedavis	c711bb9419	added search bar to desktop nodes settings	2022-11-03 09:41:10 -06:00
ryleedavis	0504f2336c	debug popup	2022-11-02 20:07:27 -06:00
ryleedavis	424852136e	v1.5.13 build 84	2022-11-02 19:00:08 -06:00
julian	40a6e916f2	currency dialog fix	2022-11-02 17:47:38 -06:00
julian	9186be7fb6	WIP: desktop dialog transitions	2022-11-02 17:29:48 -06:00
ryleedavis	c1d81b52a5	added flex and removed commented code	2022-11-02 17:20:43 -06:00
ryleedavis	939ccc6911	created currency directory	2022-11-02 17:20:43 -06:00
ryleedavis	0c4cb961d6	WIP: currency popup	2022-11-02 17:20:43 -06:00
julian	e0a8f32d69	desktop wallet network settings expanding node cards	2022-11-02 16:14:26 -06:00
julian	1f1253e070	WIP: desktop wallet network settings popups	2022-11-02 16:14:26 -06:00
ryleedavis	4aec412ce7	working language dialog	2022-11-02 14:16:38 -06:00
ryleedavis	95a35a5dd0	more import fixes	2022-11-02 14:16:16 -06:00
ryleedavis	bf0f0bc48c	language dialog ui	2022-11-02 14:14:18 -06:00
ryleedavis	2e5a5e35a0	import changes	2022-11-02 12:46:43 -06:00
julian	b915b266ae	imports fix	2022-11-02 10:09:42 -06:00
julian	fc981ef6e0	AddressBookAddressChooser search and ui tweaks	2022-11-02 10:01:17 -06:00
ryleedavis	712b33833b	stack experience dialog for desktop advanced settings	2022-11-02 09:02:53 -06:00
ryleedavis	1d47832718	WIP: needs popup for stack experience and debug info	2022-11-01 16:40:21 -06:00
julian	4d8804f78b	WIP desktop send flow address book address chooser	2022-11-01 15:58:53 -06:00
ryleedavis	60b332ad8a	auto backup drop down menu	2022-11-01 14:16:31 -06:00
julian	ec3378fec2	WIP desktop send flow	2022-11-01 11:42:33 -06:00
julian	d9b825b001	dropdown fix	2022-11-01 09:36:37 -06:00
ryleedavis	7b41da4a4f	Merge branch 'desktop' of https://github.com/cypherstack/stack_wallet into desktop	2022-11-01 08:42:41 -06:00
ryleedavis	4039014083	WIP: needs drop down menu	2022-11-01 08:42:09 -06:00
julian	03f4030d26	temp disabled erroring calls	2022-11-01 08:37:27 -06:00
julian	5f28a8cb36	desktop send info message popups	2022-10-31 12:21:58 -06:00
julian	7540e593a3	desktop receiving popups	2022-10-31 12:03:21 -06:00
julian	a1f4ec87de	desktop wallet view refactor	2022-10-30 11:26:58 -06:00
julian	c9220c5c11	desktop wallet renaming	2022-10-30 11:13:32 -06:00
ryleedavis	234794e4ca	WIP: security_settings and dialog popups	2022-10-28 17:07:13 -06:00
ryleedavis	300b1fa001	route update	2022-10-28 17:04:48 -06:00
julian	549087a4f4	WIP: desktop wallet keys popup qr code	2022-10-28 14:42:50 -06:00
julian	3a15538273	WIP: desktop wallet keys popup layouts	2022-10-28 13:51:25 -06:00
julian	cc0770b2a2	desktop tx search filter + various bugfixes	2022-10-27 16:04:13 -06:00
julian	be81625d2b	WIP: desktop transactions filter	2022-10-27 14:23:55 -06:00
julian	934cdcc917	WIP: desktop transactions list	2022-10-27 13:26:55 -06:00
julian	a92e4e24c0	desktop in wallet exchange button	2022-10-27 13:01:05 -06:00
julian	7203f09eb0	desktop sync status styling and basic functionality	2022-10-27 12:47:30 -06:00
julian	8b136b003c	overflow fix	2022-10-27 11:39:06 -06:00
julian	6ca5b55714	desktop receive style fixes	2022-10-27 11:34:46 -06:00
julian	00e8019639	desktop wallet balance info style fixes	2022-10-27 11:21:22 -06:00
julian	51b6a95390	medium desktop buttons	2022-10-27 11:05:23 -06:00
julian	d365614533	desktop send fields restyle	2022-10-27 10:51:56 -06:00
julian	3eff509c32	refactor longer bits of logic out of the build method	2022-10-27 08:50:50 -06:00
julian	d263bf1b5e	set maxLines in desktop send address and note fields to 5	2022-10-27 08:39:52 -06:00
julian	49c3c15a7d	disable fee preview calculation for desktop send form	2022-10-27 08:31:25 -06:00
julian	df7871fa6b	WIP: keys + sync status	2022-10-26 16:49:57 -06:00
ryleedavis	747ad30d74	Merge branch 'desktop' of https://github.com/cypherstack/stack_wallet into desktop	2022-10-26 16:30:33 -06:00
ryleedavis	fa48ab30f5	working on theme toggles	2022-10-26 16:29:51 -06:00
julian	5bec4962e4	WIP: desktop wallet balance display	2022-10-26 16:28:27 -06:00
julian	2a27776acf	lock send/receive height to fit	2022-10-26 16:28:27 -06:00
ryleedavis	a6a7d56647	Merge branch 'desktop' of https://github.com/cypherstack/stack_wallet into desktop	2022-10-26 16:17:59 -06:00
ryleedavis	da40886012	auto backup dialog started	2022-10-26 16:17:39 -06:00
ryleedavis	b4e7e219a4	started nodes dialog popup	2022-10-26 16:07:37 -06:00
julian	480266ef5f	lock send/receive width	2022-10-26 15:09:58 -06:00
julian	992debc86a	desktop menu icons update and exit functionality implemented	2022-10-26 15:04:04 -06:00
julian	7735412303	basic desktop receive layout	2022-10-26 13:43:22 -06:00
julian	aa8b722174	basic desktop send layout	2022-10-26 11:59:54 -06:00
ryleedavis	ab5190562d	nodes settings ui and light-theme icon added	2022-10-25 09:19:45 -06:00
ryleedavis	44790dd2df	added nodes and dark theme icon	2022-10-21 13:05:39 -06:00
ryleedavis	fba7fbf1cc	added desktop node settings	2022-10-20 11:54:24 -06:00
ryleedavis	82cc220955	settings option routes were added	2022-10-19 16:12:25 -06:00
ryleedavis	78d741374c	settings menu options ui	2022-10-19 16:10:34 -06:00
julian	22473c1668	desktop settings navigation fix	2022-10-17 10:50:37 -06:00
ryleedavis	ab28a93699	WIP: icon color change	2022-10-17 10:10:16 -06:00
ryleedavis	b09ee79865	backup and restore page	2022-10-17 09:07:17 -06:00
ryleedavis	038df82800	backup_and_restore page	2022-10-14 17:08:24 -06:00
julian	8116b267c1	desktop wallet send/receive tabview	2022-10-14 10:49:46 -06:00
ryleedavis	1157b5fd0f	redid settings option layout and added first container	2022-10-13 16:42:13 -06:00
julian	146135aad9	main desktop view divider	2022-10-13 13:10:24 -06:00
julian	7e6edd4dab	desktop basic wallet layout ui	2022-10-13 13:07:48 -06:00
julian	3f9111faac	added keys to const desktop views	2022-10-13 11:55:04 -06:00
ryleedavis	ac9413d376	value numbers allow text color to change on selection	2022-10-06 18:31:29 -06:00
ryleedavis	fac914e4ee	button color background	2022-10-06 18:24:57 -06:00
ryleedavis	ebc9c15c3d	option text color changes on selection	2022-10-06 18:23:49 -06:00
ryleedavis	09641167fb	added settings options and padding	2022-10-06 17:43:00 -06:00
ryleedavis	548b0e727e	basic desktop settings view	2022-10-06 12:25:36 -06:00
ryleedavis	b46fb829d1	page for settings options	2022-10-06 12:20:24 -06:00
ryleedavis	5827b13fe3	SettingsMenu route added	2022-10-05 11:41:41 -06:00
ryleedavis	fe49125902	desktop settings menu pages	2022-10-05 11:37:58 -06:00
ryleedavis	a4e2078184	created settings view page	2022-10-03 11:16:12 -06:00
ryleedavis	ec54d9fe8c	added settings indicator icon	2022-10-03 11:14:37 -06:00
julian	79b5cf819a	scrollable limited favorites wrapping and fixed navigation on My Stack view	2022-09-26 12:42:37 -06:00
julian	3ce4519cc7	WIP desktop favorites	2022-09-26 12:15:40 -06:00
julian	4e0c99c6f7	dynamic themed icons	2022-09-23 08:34:22 -06:00
julian	15739a22f8	dark mode toggle and color theme persistence	2022-09-22 17:48:50 -06:00
julian	598dfcbe38	live color theme toggle	2022-09-22 16:17:21 -06:00
julian	f25d9eecef	remove CFColors and some more dark color fixes	2022-09-21 16:49:48 -06:00
julian	e830286511	Color theming mostly done with dark colors	2022-09-21 15:59:52 -06:00
julian	1ae035bca1	WIP theme coloring	2022-09-20 18:46:07 -06:00
julian	79cc82f379	wallets table scrolling and spacing fixes	2022-09-19 14:39:18 -06:00
julian	0c9aa7872a	color fixes and hooked up add new wallet button on desktop	2022-09-19 13:48:55 -06:00
julian	2d677a5172	add coin icon for summary row	2022-09-19 13:42:02 -06:00
julian	40f6acda2e	added desktop menu icons	2022-09-19 13:34:27 -06:00
julian	f25fc0696a	desktop home view wallets table view	2022-09-19 11:37:51 -06:00
julian	340cb3ccc3	WIP desktop restore ui and wallets overview layout	2022-09-18 19:27:25 -06:00
julian	98252ac4fb	recovery phrase view and mnemonic table view desktop ui layout	2022-09-18 12:26:21 -06:00
julian	c28e188c8f	desktop reusable widgets and create/restore flow ui	2022-09-18 10:14:27 -06:00
julian	95d37c9c28	add wallet desktop view	2022-09-16 17:54:46 -06:00
julian	6e84f8b253	minimize toggle desktop menu options	2022-09-16 11:26:12 -06:00
julian	31565f1832	empty wallets desktop ui and simple desktop app bar class	2022-09-16 10:23:42 -06:00
julian	497d0f1555	basic desktop home view and menu outlines	2022-09-15 15:38:30 -06:00
julian	a587024fab	imports fix	2022-09-15 13:49:58 -06:00
julian	c4b546236c	desktop create password view	2022-09-15 13:48:48 -06:00