Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-11-17 17:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3093 commits 40 branches 69 tags 213 MiB
Commit graph

513 commits

Author SHA1 Message Date
julian
15a44d9dff centralize exchange rate type parameter 2023-02-08 14:48:09 -06:00
julian
998967245e migrate wallet on open 2023-02-08 07:29:27 -06:00
julian
c034413bc7 do not attempt to recover address or tx data from hive 2023-02-07 15:11:22 -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
57c31e9fa2 mb icon and refcode 2023-02-06 15:34:17 -06:00
julian
9b4dee76a5 add derivationPath to Address constructor as required 2023-02-03 17:30:32 -06:00
julian
5b5ee30e41 centralized and cleaned up bip32 utils, and added mnemonic password functionality 2023-02-03 16:34:06 -06:00
julian
b0c00d8ec7 db refactor and added address labels 2023-02-03 13:22:21 -06:00
likho
e3101d98af Update Epicbox config to match latest epic version 2023-02-03 20:34:19 +02:00
julian
4ca5cf0978 ocean breeze secondary button text color fix 2023-02-02 15:54:29 -06:00
sneurlax
4aec78f0ed
Add BIP44 derivation paths to Bitcoin Cash wallet restoration process (#330) 
* add new derive path for bch

and make it the new default.  we currently use slip44 (coinType 145) as the default

* add default cases to DerivePathType switches now failing

* normalize DerivePathType errors

log failing derivePathType or type, as appropriate

* add default derive path case to paynym interface

* use slip44 in bch wallet

* linting

* WIP look up both bip44 and slip44 addresses

slip44 is used by default

* typo fix

* typo fix

thanks Julian

* remove print

* use slip44 addresses by default

* use AddressType unknown for bip44 derive path type

* use address type unknown in _getCurrentAddressForChain, too

* generate different keys for SLIP44 and BIP44 paths

* couple more slips

* return slip44 from addressType

* slip before bip

* revert slip44-bip44, bch's bip44->bch44

* set bch44 derive path to type unknown

do not comingle paths in later output selection by index

* handle bip44 and bch44 path addresses when handling outputs

* use bip44 by default

* typofix

* typo fix in the typo fix

yo dawg

* separate new derivation path functions into their own non-testnet block

* cleanup

* disable test

should re-enable if it can be fixed with the test mnemonic in hand

---------

Co-authored-by: julian <julian@cypherstack.com>
 2023-02-02 09:24:26 -06:00
julian
6a07672437 paynym mobile ui sizing changes 2023-02-01 15:02:41 -06:00
julian
266a433aa3 add paynym share 2023-02-01 10:08:30 -06:00
julian
dc2f344779 bottom nav text color change for fruit sorbet 2023-01-31 18:37:04 -06:00
julian
7e05abec43 show green "connected" in paynym details ui 2023-01-31 17:46:30 -06:00
julian
a25c03cb5c modify bip47 utils 2023-01-31 16:21:09 -06:00
julian
6a0673bec5 EXTRACT FUNCTION FOR PARSING BLINDED PAYMENT CODE FROM A TRANSACTION 2023-01-31 14:40:54 -06:00
julian
95ff076d3d add paynym bot image background 2023-01-31 11:35:58 -06:00
julian
92076bf12a add image assets 2023-01-31 09:17:25 -06:00
julian
2f1853ef92 update default stackwallet paynym code 2023-01-30 15:38:01 -06:00
likho
f7e2568e6a Add validation for custom addresses and clean up 2023-01-30 15:44:30 +02:00
Diego Salazar
e86fa521bf
Merge branch 'staging' into ui-fixes 2023-01-27 17:26:00 -07:00
julian
3985674525 dirty payment code obfuscation 2023-01-27 18:18:58 -06:00
julian
61ad20e919 Merge remote-tracking branch 'origin/simplex' into paynyms 
# Conflicts:
#	lib/utilities/enums/coin_enum.dart
 2023-01-27 15:05:29 -06:00
julian
f2382566d9 Merge remote-tracking branch 'origin/ui-fixes' into paynyms 
# Conflicts:
#	pubspec.lock
 2023-01-27 15:04:18 -06:00
sneurlax
4ddd4a292e do not display buy icon for non-Simplex currencies 2023-01-27 14:08:34 -06:00
sneurlax
957b9cb6a3 fix buy image in wallet view on mobile 2023-01-27 11:47:42 -06:00
julian
0d775660c7 update featured paynyms 2023-01-27 10:37:15 -06:00
likho
fd0b20d661 Complete adding ERC-20 functionality 2023-01-27 14:32:05 +02:00
sneurlax
eed39d7826 remove non-stack coin images 2023-01-26 17:35:04 -06:00
likho
dbcbfe342c WIP: Add test ETH Token functionality in stack 2023-01-26 20:08:12 +02:00
julian
5de22ca858 Merge branch 'simplex' into paynyms 2023-01-26 10:16:01 -06:00
julian
b49a1942a6 update to versioned desktop secure storage and login key blob 2023-01-26 10:02:36 -06:00
julian
3c9aa827bf update to versioned desktop secure storage and login key blob 2023-01-26 10:01:51 -06:00
ryleedavis
fb2d05eadd desktop exchange toggle color fix 2023-01-25 16:48:50 -07:00
ryleedavis
83cd1759be Merge remote-tracking branch 'origin/simplex' into ui-fixes 2023-01-25 15:29:03 -07:00
ryleedavis
7950c641b6 desktop exchange toggle colors 2023-01-25 15:28:33 -07:00
ryleedavis
9815349efa exchange rate toggle color added 2023-01-25 15:12:19 -07:00
julian
7cb497f4f7 remove coin enum hasPaynymSupport getter in favor of type checking 2023-01-25 15:46:48 -06:00
julian
79db4f048c use derive path type extension method per coin 2023-01-25 13:49:14 -06:00
sneurlax
3c27bd773c Merge remote-tracking branch 'cypherstack/ui-fixes' into simplex 2023-01-25 12:18:37 -06:00
julian
6b08acf225 single DerivePathType enum declaration 2023-01-25 12:08:48 -06:00
sneurlax
9746e6ab17 add signupEpoch to prefs 2023-01-25 11:08:05 -06:00
ryleedavis
3dc98b6af6 OLED accent color and switchBGOff 2023-01-25 09:48:58 -07:00
sneurlax
c68e739ffe ID -> Id 2023-01-25 10:33:32 -06:00
likho
d4653ea794 WIP: Add token functionality 2023-01-25 18:08:27 +02:00
ryleedavis
1f0c88b7be oled black colors update 2023-01-25 08:59:20 -07:00
sneurlax
b4c16ec0b0 add userID pref and generate it if it isn't set 2023-01-24 15:28:56 -06:00
sneurlax
07247a46b9 Merge remote-tracking branch 'cypherstack/ui-fixes' into simplex 2023-01-24 13:49:14 -06:00
sneurlax
8552fbac68 use container with boxdecoration instead of stroked textstyle 2023-01-24 13:48:57 -06:00
julian
fcc68ff1da Merge branch 'ui-fixes' into paynyms 2023-01-24 13:34:13 -06:00
julian
96e2f8fa66 add border to secondary buttons based on theme 2023-01-24 13:31:21 -06:00
julian
aced68aa32 add border to secondary buttons based on theme 2023-01-24 13:30:00 -06:00
ryleedavis
914e0e9034 buttonBackBorderSecondary + disabled colors added 2023-01-24 12:29:14 -07:00
julian
028b261dee refactor button style getter names 2023-01-24 13:29:12 -06:00
sneurlax
fb257ef39e also switch simplex image for oled black theme 2023-01-24 13:28:39 -06:00
sneurlax
1ebc8868f0 Merge remote-tracking branch 'cypherstack/ui-fixes' into simplex 2023-01-24 12:44:50 -06:00
julian
b8be066acb add per theme box shadow and per theme homeview button bar shadow 2023-01-24 12:42:41 -06:00
sneurlax
32ca83673a Merge remote-tracking branch 'cypherstack/ui-fixes' into simplex 2023-01-24 12:29:13 -06:00
sneurlax
44fe0a4a0f comment update 2023-01-24 11:23:39 -06:00
sneurlax
e465030d3d add light version of simplex logo for dark themes 2023-01-24 11:12:40 -06:00
sneurlax
dc30b5d42a unify text styles 
can return to theme-case style if needed
 2023-01-24 10:06:49 -06:00
sneurlax
83da7a2680 add fiat enums for pretty names 2023-01-24 10:05:15 -06:00
julian
9e24f2bdbc added missing text styles 2023-01-24 08:10:52 -06:00
ryleedavis
7fe1fefea2 Merge remote-tracking branch 'origin/isar_migrate' into ui-fixes 2023-01-23 17:31:24 -07:00
ryleedavis
90eb0b77c0 WIP: fruit sorbet background 2023-01-23 15:36:13 -07:00
julian
2259e15da8 re enable paynym 2023-01-23 15:39:19 -06:00
sneurlax
12ba1fa24a add OLED Black and Fruit Sorbet theme cases to currency text style 2023-01-23 15:02:30 -06:00
julian
69dfbb5873 paynym clean up to use isar transaction and address upgrades 2023-01-23 12:19:13 -06:00
ryleedavis
edec5f0c2a adding fruit sorbet theme type and selector svg 2023-01-23 10:58:06 -07:00
julian
6790f702c2 migrate bugfix 2023-01-23 10:37:27 -06:00
julian
a135404d67 migrate bugfix 2023-01-23 09:37:14 -06:00
ryleedavis
69262cefd2 added fruit sorbet theme colors 2023-01-22 23:16:01 -07:00
sneurlax
9b944f51f1 outline currency symbols and use selected symbol in buy form fiat select 2023-01-20 19:34:54 -06:00
sneurlax
49f024b656 use Julian's isStackCoin helper func 
very nice.  didn't realize I could catch an error.  learning every day round here
 2023-01-20 18:26:13 -06:00
sneurlax
b376b00d7c add icons for buy coins 2023-01-20 18:21:36 -06:00
sneurlax
3c664bfef5 remove duplicate declaration 2023-01-20 17:58:31 -06:00
sneurlax
50a3815946 get coin images for coins we support 2023-01-20 17:58:18 -06:00
julian
017719971b isar init fix and renaming of init functions 2023-01-20 15:57:54 -06:00
julian
3b9cb60aaa update text styles 2023-01-20 15:32:49 -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
likho
706cbbfa39 Add tokens class 2023-01-20 19:24:19 +02:00
julian
fd5a237170 move db modifying func to MainDB out of WalletDb, add MainDB mocks to coin tests, build runner generate mocks 2023-01-19 15:13:03 -06:00
julian
60e850f442 add mockable override option for testing purposes 2023-01-19 14:33:23 -06:00
julian
8921302ee0 remove useless walletId param from db init 2023-01-19 14:07:08 -06:00
julian
5badeab621 temp disable partial paynym support in ui 2023-01-19 09:41:10 -06:00
likho
1c435bb739 Merge branch 'add-ethereum' into add-erc-20-tokens 2023-01-19 11:03:00 +02:00
likho
74ab70df7e Use mainnet 2023-01-19 10:45:09 +02:00
julian
6784e6aab4 dynamic parsing fixes 2023-01-18 15:15:38 -06:00
julian
4dabeebfab WIP migrate 2023-01-18 14:29:24 -06:00
julian
9388885047 add optional prefix param to address to script conversion 2023-01-16 09:17:32 -06:00
julian
3d4d57a97c max log message length to store in db 2023-01-16 08:34:52 -06:00
likho
b5a1983734 WIP: ADD ECR-20 2023-01-16 15:19:32 +02:00
likho
dd8319ee11 Update ETH color 2023-01-16 09:42:29 +02:00
julian
9286ae9902 use simple setState for toggling between buy with crypto/fiat and store current selected crypto/fiat values in state vars and update ui accordingly 2023-01-15 18:24:47 -06:00
julian
650ae9fe09 buy quote preview view and sample quote class 2023-01-15 18:09:11 -06:00
julian
ed0089e94d default nodes fix 2023-01-13 16:35:14 -06:00
sneurlax
ac2775dc42 connect toggle to preferences and use value in parent buy form 2023-01-11 16:17:46 -06:00
sneurlax
863c59c25d add fiat enums and coins -> fiats 2023-01-11 12:03:50 -06:00
julian
822bb219b6 migrate prep comment 2023-01-11 08:24:30 -06:00
likho
8b87c7367a Error fixes 2023-01-11 15:35:51 +02:00
ryleedavis
9f5ce0db7a textRestore added for color fix 2023-01-10 15:28:59 -07:00
ryleedavis
a90f7fe994 textFieldError/SuccessBorder added 2023-01-10 13:48:40 -07:00
ryleedavis
af698332e7 wallet nav bar and wallet card text colors fixed 2023-01-10 12:00:38 -07:00
julian
a0df73551e update generated files 2023-01-10 10:02:54 -06:00
Diego Salazar
fcb2935d64
Merge pull request #309 from cypherstack/trusted-node 
Add trusted node setting to Monero and Wownero
 2023-01-06 17:20:49 -07:00
sneurlax
a8d5301381 trust monero and wownero default nodes 2023-01-06 17:10:05 -06:00
julian
16dc9efa52 added assets 2023-01-06 16:31:04 -06:00
ryleedavis
5e795ccc33 oledBlack desktopTextSmall color fix 2023-01-06 09:21:31 -07:00
ryleedavis
23e3452cf1 oledBlack theme added to desktop 2023-01-06 09:12:01 -07:00
sneurlax
903e034b58 add trusted checkbox to monero and wownero node details 
defaults to false
TODO call native function to set node as trusted when checked (and vice versa)
 2023-01-05 20:03:20 -06:00
ryleedavis
7aad7cb9e3 oledBlack text color fix 2023-01-05 13:59:17 -07:00
ryleedavis
0a810987c0 oledBlack added to textStyles and appearance settings 2023-01-05 13:34:56 -07:00
ryleedavis
8ca405cfea oledBlack theme added to themeType 2023-01-05 11:51:15 -07:00
ryleedavis
cd7dd20652 oled_black hex added 2023-01-05 11:34:29 -07:00
ryleedavis
a661e3acbc added oled-black-theme selector + prep oledBlack theme file 2023-01-04 18:19:36 -07:00
julian
33926d2b5e address popup desktop conditional layout 2023-01-04 11:20:25 -06:00
sneurlax
0ee2357c60 add basic buy page 2023-01-04 10:51:38 -06:00
julian
772cca4201 paynym api slightly better error message handling 2023-01-04 08:33:54 -06:00
julian
f3b1d11a46 added paynym response objects and refactored paynym.is api 2023-01-02 15:16:01 -06:00
julian
f9491f8215 Merge branch 'xmr-sync' into paynyms 
# Conflicts:
#	lib/utilities/enums/coin_enum.dart
 2023-01-02 13:47:10 -06:00
julian
7013e99081 enable wow on desktop 2022-12-29 13:38:39 -06:00
shillo
cd86085d16 add windows path 2022-12-29 10:48:12 -06:00
julian
0711bd03cf paynym api debug logs 2022-12-21 16:44:38 -06:00
julian
2297fbf028 add (follow) new paynym view 2022-12-21 13:46:50 -06:00
julian
08ad23cc73 featured paynyms widget 2022-12-21 12:03:23 -06:00
julian
27bb0cf1c9 place holder featured paynyms 2022-12-21 11:13:41 -06:00
julian
66271a9018 paynym qr popup 2022-12-21 11:06:53 -06:00
julian
3b6d53d685 WIP paynym home view 2022-12-21 10:17:53 -06:00
julian
bbd04f46bb created_paynym object 2022-12-20 16:58:25 -06:00
julian
7d8c2d1fda paynym api rename 2022-12-20 14:29:35 -06:00
julian
1ae4f40d63 some basic ui prep for paynym integration 2022-12-20 14:29:25 -06:00
julian
101de01fa2 update default btc testnet electrumx url 2022-12-20 10:08:53 -06:00
julian
07eabb6092 update default btc testnet electrumx url 2022-12-20 10:08:14 -06:00
julian
177d2e4bc8 correct endpoints 2022-12-16 17:45:08 -06:00
julian
37e8f69950 paynym api 2022-12-16 16:31:13 -06:00
ryleedavis
096d2c007e Merge branch 'desktop' of https://github.com/cypherstack/stack_wallet into desktop 2022-12-14 13:56:13 -07:00
julian
c84ae8ff21 db migrate to force firo cache clear 2022-12-14 10:26:48 -06:00
likho
6370e927a2 WIP: Add Ethereum 2022-12-14 12:15:22 +02:00
likho
eca8ca21bc WIP: Add Ethereum 2022-12-13 19:39:19 +02:00
ryleedavis
390623560e debugPrints that aren't needed ? 2022-12-12 17:17:02 -07:00
Diego Salazar
2a38d5691e
Merge pull request #260 from cypherstack/add-particl 
Add Particl
 2022-12-12 16:13:43 -07:00
julian
236e04f849 epic node changes and fixes 2022-12-12 15:59:06 -06:00
sneurlax
1c856a9b66 update particl node 2022-12-09 12:58:35 -06:00
sneurlax
a8c1787dbc add particl to list of default nodes 2022-12-07 14:47:22 -06:00
sneurlax
ffeaeacc29 add particl bgimg 2022-12-07 11:40:19 -06:00
sneurlax
11d5ad4427 add particl logo 2022-12-07 11:32:20 -06:00
likho
20dbb86742 Update pubspec.yaml to use commit for Particl flag in bitcoindart 2022-12-07 17:47:55 +02:00
likho
4e3a5d23db Update node to stack node 2022-12-07 11:20:35 +02:00
julian
00f89e7d1b added functionality to sec store interface 2022-12-05 13:59:07 -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
sneurlax
046a5c9506 Merge branch 'tests/bitcoindart-particl' into tests/particl 2022-11-29 13:42:43 -06:00
sneurlax
245dba515f add particl constants 2022-11-29 13:41:01 -06:00
sneurlax
ec399ade0a Remove testnet 2022-11-29 13:14:11 -06:00
Likho
d9338d34f2 Fix particl node 2022-11-29 13:12:15 -06:00
sneurlax
c7abf3a7e8 WIP: Add particle 2022-11-29 13:11:30 -06:00
sneurlax
17f080417e Merge remote-tracking branch 'cypherstack/staging' into tests/particl 2022-11-29 11:02:20 -06:00
julian
8960bb5764 linux small screen width check 2022-11-28 12:46:45 -06:00
julian
9fce8ca107 familiarity fix 2022-11-25 17:14:06 -06: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
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
julian
172b3d157b wownero disable on desktop fix 2022-11-22 15:37:47 -06:00
sneurlax
3306cf8b99 expand the ternary for readability 2022-11-22 15:34:06 -06:00
sneurlax
c3a3dd3180 remove Wownero if isDesktop 
or isLinux or isWindows or isMacOS, respectively
 2022-11-22 15:34:01 -06:00
sneurlax
e2baf7372c expand the ternary for readability 2022-11-22 11:57:54 -06:00
sneurlax
7654da1d8b remove Wownero if isDesktop 
or isLinux or isWindows or isMacOS, respectively
 2022-11-22 11:57:49 -06:00
julian
b512b2cefb consistent decimal places on firo balance selection sheet 2022-11-22 07:24:04 -06:00
julian
e2a172f747 firo private/public balance desktop toggle 2022-11-19 18:04:53 -06:00
julian
51cfc3f4df light colors accent blue fix? 2022-11-18 16:14:27 -06:00
julian
96453e9054 missing asset declaration 2022-11-18 16:06:38 -06:00
ryleedavis
9956a497df ocean breeze shadow color fix 2022-11-18 13:26:17 -07:00
julian
7ef31cbf87 add back exchange menu option and adjust icon color 2022-11-18 13:08:20 -06:00
julian
9508afbd5b add ocean breeze specific assets 2022-11-18 12:26:27 -06:00
ryleedavis
8207474d09 ocean breeze selector + functionality added 2022-11-18 09:30:31 -07:00
ryleedavis
2137cffd84 ocean breeze theme colors added 2022-11-17 20:04:15 -07:00
julian
38251dc5ed textStyles prep for ocean theme 2022-11-17 18:21:04 -06:00
ryleedavis
aead30504e alignment for settings pages icons 2022-11-15 14:13:16 -07:00
julian
e053764554 basic desktop change passphrase functionality 2022-11-14 13:27:01 -06:00
julian
0164679cce File system path clean up 2022-11-12 16:07:57 -06: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
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
ba853837ce verify passphrase functionality added to password service 2022-11-11 10:45:50 -06: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
julian
be952d3e35 manually add bch uri fixes from 28da2b8900 2022-11-10 09:54:58 -06:00
julian
c7a6ffd3e4 Merge branch 'staging' into desktop-testing 2022-11-09 17:58:34 -06: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
sneurlax
bad88aeecb
Merge branch 'staging' into wownero/25-word 2022-11-09 08:33:15 -06:00
julian
a94e66da9e temp disable wow 25 word option in ui 2022-11-08 19:07:18 -06:00
julian
cede571350 desktop login/password screen 2022-11-08 15:38:53 -06:00
sneurlax
48e8501e27 cherrypick e41f8088b0 2022-11-08 13:35:27 -06:00
julian
e41f8088b0 WIP: wownero 25 word seed option ui 2022-11-08 12:00:10 -06:00
julian
a8c3d5f104 format sha1 string 2022-11-08 11:41:12 -06:00
julian
f17785ffc7 monero/wownero untrusted cert popup 2022-11-08 10:18:48 -06:00