Commit Graph

384 Commits

Author SHA1 Message Date
botond
9f6376c1b2
fix: dialog alignment (#1281) 2022-09-07 11:35:48 -07:00
Art
d2791f2e59
chore: proposal schema change (1057) (#1169)
* chore: moved proposal queries to lib/governance

* chore: used new rationale title and description

* chore: addressed PR comments, refactored

* chore: moved proposal queries to lib/governance

* chore: used new rationale title and description

* chore: addressed PR comments, refactored

* fix: dropped s after merge

* fix: fixed lodash imports
2022-09-07 18:35:29 +02:00
Art
9de3683bf3
chore: filter assets by status (1108) (#1192)
* chore: filter assets by status (1108)

* chore: moved asset status

* chore: re-adding filterin after merge (changed upstream)

* chore: filter assets by status (1108)

* chore: moved asset status

* types

* fixed deposit cypress tests
2022-09-07 18:01:16 +02:00
botond
293e2ffbc3
Fix/UI dialog overflows (#1276)
* fix: dialog overflows

* fix: hide close icon when no change function passed in
2022-09-07 14:02:23 +01:00
m.ray
cae6162a7f
feat: liquidity provisions view (#1133)
* feat(#473): add positions metrics data provider

* feat(#473) add positions stats

* feat(#473) add positions stats

* feat(#473): add positions stats

* feat(#473): add positions stats

* feat(#473): position metrics, test and refactoring

* feat(#473): add unit tests to positions table

* feat(#473): fix spelling, order positions by updated at desc

* feat(#473): protect from division by 0

* feat(#473): fix trading positions e2e tests

* feat(#473): fix e2e data mocks

* feat(#473): post code review clean up

* feat(#993): dependencies handling in data provider

* feat(#993): fix e2e tests data mocks

* feat(#993): remove position metrics mocks, add market data market id

* feat: #994 add price monitoring bounds and candles update interface

* fix: move best bid price to diff section

* feat(#993): add missing mocks, fix combine function

* fix: add insurance pool and calc volume 24h

* feat: display some oracle min info, asset id, insurance pool, move open interest and 24hVol

* fix: add  market-info.cy.ts case

* fix: remove # from numbered price monitoring settings

* fix: add insurance pool test

* fix: format 24hvol

* feat(#993): set loading initially to true, add unit tests

* feat(#993): cleanup, add comments

* feat(#993): remove undefined from client type

* fix: remove indicativeVolume and oracleSpecBinding from market info

* feat(#993): cosmetic changes

* fix: add oracleSpecBinding back

* Update libs/deal-ticket/src/components/info-market.tsx

Co-authored-by: botond <105208209+notbot00@users.noreply.github.com>

* feat: add initial queries

* fix: memo yesterday's timestamp

* fix: add back info

* fix: update query

* fix: add view full oracle details link and update mappings

* fix: regen code, make link reactnode, fix index.ts

* feat: add liquidity lib, refactor info market

* fix: remove liquidity query from deal-ticket

* feat:(#993): pass informaton about update callback cause

* fix: small ui tweaks

* fix: display in grid

* feat: navigate to oracle by termination id

* feat: #491 add use liquidity provision merging

* fix: remove logs, add extra check on my liquidity provision

* fix: type number trivially inferred from a number literal, remove type annotation

* fix: cypress tests and formatting for market info

* Update libs/deal-ticket/src/components/market-info/info-market.tsx

* fix: use position decimal places for stake and market value proxy

* fix: #491 use size/position decimal places for obligation, supplied and commitment amount

* fix: add size component and use decimal places

* fix: update readme liquidity

* fix: #491 add correct asset decimal formatters

* Update libs/deal-ticket/src/components/market-info/tooltip-mapping.tsx

Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>

* fix: make link instead of button to open liquidity

* fix: #491 add liquidity page, link to trading mode tooltip, tabs hidden or choose active

* fix: remove LP dialog, use only link to page

* fix: add market id in LP view

* fix: follow trade grid design

* fix: add one line tabs , remove link styling, remove any, add value formatters

* fix: remove falsy check LP undefined

* fix: keep date formatter in LP table

* fix: add generic type market info, hooks in body function

* fix: revert number formatters

* fix: use one param only in network params query

* fix:  use network param in web3 lib

* fix: move lp container to trading app

* fix: remove resizable panel

* feat: add header component, remove isEstimate

* chore: remove unnecessary type cast

* fix: fix build with children map clone element

* chore: lint

* fix: move use network params to react helpers

* fix: add const for LP tabs

* fix: fix formatting on LP page

* fix: only show tilde for liquidity monitoring auction end date

* fix: market id being rendered twice in market info

* chore: fix lint

* fix: types for generate withdraw form query

* chore: fix intermittent failing withdrawal test

* Update libs/deal-ticket/src/components/market-info/info-market.tsx

* chore: add another wait for market

Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>
Co-authored-by: botond <105208209+notbot00@users.noreply.github.com>
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
Co-authored-by: Joe <joe@vega.xyz>
2022-09-07 12:05:28 +01:00
Joe Tsang
510b6ad0d5
Test/840 positions update (#1250)
* test: add test for positions in portfolio

* test: update position validation to include updates

* chore: add wait for marketlist
2022-09-06 17:34:40 +01:00
botond
a57d484496
Fix/1083: Update type generator (#1219)
* feat: add new generator with config

* feat: split off gql queries to separate files for the new generator

* fix: delete dummy schema

* feat: add generated queries with new codegen

* fix: regenerate from scratch and remove duplicates

* fix: libs and app gen folders

* fix: remove more duplicate queries

* fix: add generated files to be ignored by the formatter

* fix: format

* fix: generated imports

* fix: lint

* fix: accounts export

* fix: more imports

* fix: add type alias for new type system and regenerate

* fix: format

* fix: delete leftover file from merge
2022-09-06 10:03:10 +01:00
macqbat
7fe282a9fb
feat: [console-lite] - refactor market-list view afetr design update (#1244)
* feat: [console-lite] - refactor market-list view afetr design update

* feat: [console-lite] - refactor market-list fix failing test

* feat: [console-lite] - refactor market-list fix failing test

* feat: [console-lite] - refactor market-list fix failing test

Co-authored-by: maciek <maciek@vegaprotocol.io>
2022-09-06 08:13:17 +02:00
Matthew Russell
5eb06254de
feat (#896): large withdraws (#1180)
* feat: add deposits table to deposits tab on portfolio page

* feat: refactor use-withdraw hook to not invoke eth tx

* feat: rename hook for clarity

* feat: fix withdrawal creation test

* feat: update withdraw-manager and withrawals-table tests

* chore: fix lint

* feat: remove web3 input to avoid double dialog

* chore: use renderHook from testing-library/react

* chore: update to use non deprecated fields

* chore: remove usage of all bridge contract

* feat: correctly merge cache update in withdrawals table

* feat: changes to support token app withdrawals

* chore: add height to ag grid table wrapping element

* feat: add txhash col to withdraw table

* feat: provide better ui if withdrawal is not ready to be completed

* feat: use separate dialogs for txs

* feat: allow user to immediately complete withdrawal if delay not triggered

* feat: add withdraw store to tidy up state management

* chore: fix tests

* chore: convert callback to promises, fix tests, delete withdraw page

* chore: fix lint errors

* fix: withdrawals link in nav

* feat: style changes after design update

* fix: proposal form test

* chore: tidy error ui logic

* feat: review comments

* chore: lint

* feat: add better typing for tables

* chore: put withdrawals tab at the end

* chore: update i18n

* fix: dialog in positions manager due to rename

* chore: increase spacing in withdrawal form

* chore: update tests

* chore: lint

* chore: use new assetsConnection and update cy test

* fix: incorrect shape of withdrawal generate function

* feat: delete withdrawals page now that its shown on the portfolio page

* chore: update tests to check for withdrawals page

* chore: fix tests again

* fix: page title test
2022-09-05 18:30:13 -07:00
Art
e674efdb14
Feat/707 link to market proposal (#1222)
* feat: link to market proposal (707)

* feat: link to market proposal (707)

* removed a line

* removed label which made edd and barney sad
2022-09-05 14:06:58 +02:00
Bartłomiej Głownia
96d08f93cd
feat(#1235): fix select element dropdoen background (#1237) 2022-09-02 18:07:34 -07:00
Bartłomiej Głownia
6de90c6b1f
feat(#840): update positions tab (#1101)
* feat(#473): add positions metrics data provider

* feat(#473) add positions stats

* feat(#473) add positions stats

* feat(#473): add positions stats

* feat(#473): add positions stats

* feat(#473): position metrics, test and refactoring

* feat(#473): add unit tests to positions table

* feat(#473): fix spelling, order positions by updated at desc

* feat(#473): protect from division by 0

* feat(#473): fix trading positions e2e tests

* feat(#473): fix e2e data mocks

* feat(#473): post code review clean up

* feat(#993): dependencies handling in data provider

* feat(#993): fix e2e tests data mocks

* feat(#993): remove position metrics mocks, add market data market id

* feat(#993): add missing mocks, fix combine function

* feat(#993): set loading initially to true, add unit tests

* feat(#993): cleanup, add comments

* feat(#993): remove undefined from client type

* feat(#993): cosmetic changes

* feat(#840): update positions tab

* feat:(#993): pass informaton about update callback cause

* feat(#840): update positions tab

* feat(#840): update positions tab

* feat(#840): update positions tab

* chore: skip handles 5000 markets e2e test

* feat(#840): update positions tab

* feat(#840): rename assetDecimals to decimals

* feat(#840): close position

* feat(#993): notify about update

* feat(#840): add use close position hook

* feat(#840): do not show 0 volume positions, make liquidation price minimum 0

* feat(#840): post code review fixes and improvments

* feat: fix fill-table spec
2022-09-02 13:53:00 -07:00
botond
9bcb923cc0
Feat/375: Risk notice dialog (#1096)
* feat: add risk warning modal WIP

* feat: add risk notice modal and fix broken mobile dialog styles

* fix: format

* fix: lint

* fix: format

* fix: dialog scrollbar

* fix: style issues

* fix: styles

* fix: spacing

* fix: more style fixes

* fix: more spacing

* fix: format

* fix: move logic into risk dialog from global app

* fix: brance yourselves, more style updates

* feat: add test for risk dialog
2022-09-02 15:53:38 +01:00
macqbat
02897f1ee1
feat: [console-lite] - improve useOrderBook hook (#1208)
* feat: [console-lite] - improve useOrderBook hook

* feat: [console-lite] - improve useOrderBook hook - add unit test

* feat: [console-lite] - improve useOrderBook hook - add unit test

* feat: [console-lite] - improve useOrderBook hook - reduce mock size

* feat: [console-lite] - improve useOrderBook hook - small clean up

* feat: [console-lite] - improve useOrderBook hook - small clean up

Co-authored-by: maciek <maciek@vegaprotocol.io>
2022-09-02 11:29:52 +02:00
Matthew Russell
ca11b02aea
chore: fix large loader dimensions (#1220) 2022-09-01 15:00:22 -07:00
Bartłomiej Głownia
75044fa520
Feat/81 market table filters (#1203)
* feat(#81): amend market table filters

* chore: fix home not default found test
2022-09-01 17:03:42 +01:00
Matthew Russell
429b57ec52
chore: remove valid chain check (#1164)
* chore: remove valid chain check

* chore: lint

* fix: remove e2e test checking network ids

Co-authored-by: Botond <botond@vegaprotocol.io>
2022-09-01 07:57:35 -07:00
Matthew Russell
8e70f5face
chore: readd classname to formgroup (#1215) 2022-08-31 16:13:17 -07:00
m.ray
64817aa43e
fix: market ordering (#1171)
* fix: order by trading mode not by  open timestamp

* fix: add fixed vh on landing content

* fix: order by trading mode

* fix: useMarketList added to data provider

* fix: fix network-parameters.spec.tsx

* fix: network switcher font color & height of table rows

* chore: add market page mock to hook

* fix: remove redundant class

* fix: formatting and height of landing modal

* fix: break-word on ids in market info

* fix: linting issue remove import

* fix: remove markets landing mock as it is similar with market list

* Update apps/trading-e2e/src/integration/home.cy.ts

Co-authored-by: Joe <joe@vega.xyz>
2022-08-31 20:06:34 +01:00
Elmar
1cdea0b2e8
Feat/915 deposit funds (#1129)
* feat(web3): make web3 container component reusable

* feat(console-lite): add deposits tab to portfolio page

* fix(console-lite): linting errors

* fix(console-lite): pr comments

* fix(console-lite): use enums for network vars
2022-08-31 16:33:08 +01:00
Elmar
4407a778a7
Feat/1147 input setter (#1148)
* feat(console-lite): stretch half page width for xl screens on connect wallet on portfolio page

* feat(console-lite): make InputSetter component reusable

* fix(console-lite): pr comments

* fix(console-lite): failing tests
2022-08-31 16:32:53 +01:00
macqbat
d7fee66d89
feat: [console-lite] - calculate slippage (price impact) (#1173)
* feat: [console-lite] - calculate slippage (price impact)

* feat: [console-lite] - move slippage from estimates to deal-ticket-size

* feat: [console-lite] - slippage - add a bunch of unit tests

* feat: [console-lite] - slippage -

* feat: [console-lite] - slippage - fix some faillings, add enum instead text entry

* feat: [console-lite] - slippage - adjust tooltip info text

* feat: [console-lite] - slippage - fix failling cache

* feat: [console-lite] - slippage - resolve conflicts after rebase

* feat: [console-lite] - slippage - fixes after review

* feat: [console-lite] - slippage - fixes after review

* feat: [console-lite] - slippage - add memo back to the hook

* feat: [console-lite] - slippage - add back order book model outside hook

* feat: [console-lite] - slippage - adjust some int test

* feat: [console-lite] - slippage - adjust some int test

Co-authored-by: maciek <maciek@vegaprotocol.io>
2022-08-31 15:23:01 +02:00
John Walley
036f67a68e
1197 improve depth chart price level data handling (#1198)
* refactor: extract parseLevel and updateLevels into new file

* test: add unit tests

* Expand unit test
2022-08-31 09:14:10 +01:00
Matthew Russell
ad00fcfd39
chore: fix market sticky header color 2022-08-30 23:13:00 -07:00
m.ray
509a68d795
fix(#661): prices and number values right-aligned (#1193)
* fix: #661 prices and number values right-aligned

* fix: revert fills-table test created instead of date
2022-08-30 22:59:30 -07:00
PeteWilliams
fa6c4e7a02
chore: tweak position meter colours (#1185) 2022-08-30 22:54:09 -07:00
PeteWilliams
9199c79186
chore: ui tweaks to select market panel (#1074)
* chore: ui tweaks to select market panel

* chore: add close button to popover/select market panel

* fix: fixing broken styling on cell data

* chore: tweaked styling for fees tooltip

* Revert "chore: tweaked styling for fees tooltip"

This reverts commit 3f1a34d835eb0cbea82847e37e66c5a4c8bf723d.

* chore: changing text case

* feat: adjust styles to align with petes changes

* feat: readd sticky table headers

* chore: linting fixes

Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
2022-08-30 22:46:42 -07:00
Matthew Russell
c259622848
feat(#927) design update (#1201)
* feat: create new buttons

* feat: update anchor and button link styles

* feat: add icon support

* feat: fix full width with icon

* feat: convert invalid button props to use new props

* feat: tidy up explorer

* feat: more tidy up for token and trading

* feat: move styles to css file using @apply

* chore: remove css with @apply as its not working in apps

* fix: deposit form button

* feat: use default tailwind config, start on forms

* feat: fixup trade grid styles

* feat: form styles

* feat: styles for order book and tables

* feat: make key management use dropdown

* feat: update various components

* feat: tidy up wallet section

* feat: token tidy up

* feat: token governance styles

* Feat/927: Dialog styling

* feat: token styles

* feat: add font familys

* feat: change token borders to be softer

* feat: console-lite changes to support new theme

* Feat/927: Centered key-value-table.tsx spacing

* Feat/927: Tweak to Explorer site border colours to be inline with trading

* Feat/927: Tweak to Explorer header

* Feat/927: Theme switcher icon colours

* Feat/927: Fix for Explorer block data styling

* feat: fix tests, add status footer and change logos

* feat: render both theme icons to avoid hydration error

* chore: run migrations for project

* fix: tailwindconfig build to work with new next version

* feat: use document page for next as per documentation

* chore: update build targets to use development mode when serving

* fix: console-lite default text colors

* chore: fix tooltip text break, change submit button

* feat: adjust console-lite styles to work with tabs

* feat: add bespoke dialog for console-lite market-selector

* Feat/927: Theme switcher now has prop for fixed bg colour

* Feat/927: Font size and border radius tweak for toggles

* Feat/927: Cleaned up trade-grid.tsx spacing

* feat: responsive styles for market header and nav

* feat: update designs for market popover

* fix: nav active state

* chore: allow classname to be passed to button

* Feat/927: Fix Token width on desktop (was overflowing)

* Feat/927: Fix token header h1 from wrapping

* Feat/927: Tweak for claim-flow.tsx

* fix: connect button test

* Feat/927: Proposals list styling polish

* Feat/927: key-value-table.tsx spacing tweak

* feat: add copy button to kp dropdown

* Feat/927: Removing old theme params and uses

* Feat/927: Removing old theme params and uses, documenting the now used otb sizes

* feat: use key val table in asset dialog

* feat: align tooltip styles

* fix: orderbook grid alignment

* chore: linting

* fix: dialog sizing in medium mode, node switcher styles

* chore: remove unused color classes

* feat: update radio and checkbox designs

* feat: updates to storybook

* feat: update design system stories

* chore: stories update

* chore: rename resize panels and tidy

* feat: fix checkbox tick

* fix: add poyfills for jest in trading test setup

* chore: fix checkbox tests

* chore: fix tests

* chore: fix tests again

* chore: revert token wallet name test

* fix: tooltip tests on console-lite

* fix: wallet dropdown test

Co-authored-by: sam-keen <samuel.kleinmann@gmail.com>
2022-08-30 21:35:46 -07:00
Bartłomiej Głownia
ebe3d36d3d
feat(#81): make market list table sortable and add filters (#1082) 2022-08-30 15:28:58 +02:00
Art
2970aae670
fix: included origin of token, moved formatters (#1141)
* fix: included origin of token, moved formatters

* fix: removed title attr, not needed

* fix: added distinction between wallet and contract if they have the same key

* fix: included origin of token, moved formatters

* fix: removed title attr, not needed

* fix: added distinction between wallet and contract if they have the same key
2022-08-30 10:21:27 +02:00
Bartłomiej Głownia
577ba28ae5
chore: fix trading app e2e tests and mocks (#1142)
* chore: fix trading app e2e tests and mocks

* chore: fix e2e build target setup and tsconfigs
2022-08-26 09:41:47 -07:00
Bartłomiej Głownia
93a5f911f5
feat(#993): derived data provider (#1047)
* feat(#473): add positions metrics data provider

* feat(#473) add positions stats

* feat(#473) add positions stats

* feat(#473): add positions stats

* feat(#473): add positions stats

* feat(#473): position metrics, test and refactoring

* feat(#473): add unit tests to positions table

* feat(#473): fix spelling, order positions by updated at desc

* feat(#473): protect from division by 0

* feat(#473): fix trading positions e2e tests

* feat(#473): fix e2e data mocks

* feat(#473): post code review clean up

* feat(#993): dependencies handling in data provider

* feat(#993): fix e2e tests data mocks

* feat(#993): remove position metrics mocks, add market data market id

* feat(#993): add missing mocks, fix combine function

* feat(#993): set loading initially to true, add unit tests

* feat(#993): cleanup, add comments

* feat(#993): remove undefined from client type

* feat(#993): cosmetic changes

* feat:(#993): pass informaton about update callback cause
2022-08-26 08:39:40 -07:00
Sam Keen
171babc2c9
Feat/1010: show rejected reason (and error details) on propose form results (#1086)
* feat/1010: Show proposal rejected reason in transaction dialog

* feat/1010: Show wallet rejection details in transaction dialog

* Feat/1010: Updated wallet types

* Feat/1010: Ensuring rejected proposals get the correct transaction dialog title

* Feat/1010: Fixing linting warning

* Feat/1010: Skipping node switcher tests for now
2022-08-26 16:05:16 +01:00
botond
7d6c2eebf8
fix: force height for ns dropdown items (#1167)
* fix: force height for ns dropdown items

* fix: padding override fix
2022-08-26 12:22:31 +01:00
m.ray
a34aec3c47
fix: update apollo URL to check for NX_VEGA_URL again (#1170) 2022-08-26 12:21:11 +01:00
Matthew Russell
4af10977d0
chore: remove stagnet1, fix env vars for api endpoints (#1163) 2022-08-25 17:07:27 -07:00
botond
760a24b500
fix (#1117): Network stats env (#1122)
* fix: explorer environment

* fix: stats env

* fix: format

* fix: remove logging
2022-08-25 14:46:17 -07:00
botond
eaea6a38ec
Feat/722: Network switcher in console2 (#1073)
* feat: add network switcher dropdown to the trading app

* fix: refactor label text

* fix: format

* fix: paddings

* fix: use theme spacing instead of px
2022-08-25 15:23:57 +01:00
m.ray
e9019c04f7
fix: do not show edit/cancel buttons on order partially filled (#1150) 2022-08-25 13:50:25 +01:00
macqbat
1bb63dcb15
feat: [console-lite] - refactor wallet connector (#1126)
* feat: [console-lite] - refactor wallet connector

* feat: [console-lite] - refactor wallet connector

* feat: [console-lite] - refactor market selector focusing - review feedback

Co-authored-by: maciek <maciek@vegaprotocol.io>
2022-08-25 11:48:37 +02:00
Joe Tsang
750c421ed5
Test/fix trading tests (#1139) 2022-08-25 09:01:20 +01:00
John Walley
d6b362805e
fix(#1134): pass correct price and volume formatters to depth chart (#1135) 2022-08-24 10:23:05 -07:00
Matthew Russell
08aa87f3dd
chore: dont use env var for type generation, regen types 2022-08-23 15:45:27 -07:00
Matthew Russell
d29e815337
chore: defaul type generation to use testnet 2022-08-23 15:36:05 -07:00
Art
db08a177c4
fix(#806): dissasociation without vega wallet (#1075)
* fix: dissasociation without vega wallet (806)

* fix: removed unused import

* chore: removed redundant func prepend0xIfNeeded

* Update apps/token/src/routes/staking/disassociate/disassociate-page.tsx

Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>

* Update apps/token/src/routes/staking/disassociate/disassociate-page.tsx

Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>

Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
2022-08-23 15:09:08 -07:00
Art
aea2a85519
chore(#961): assets to assetsconnection (#1000)
* chore: assets to assetsconnection

Changed queries in explorer app

* chore: assets to assetsConnection (961)

* chore: assets to assetsConnection (961)

* chore: assets to assetsConnection (961)

* fix: after merge issues fixed
2022-08-23 15:01:57 -07:00
Matthew Russell
47c087ad88
fix: render dialog without relying on query so it doesnt appear well after the page has loaded (#1105) 2022-08-23 15:00:01 -07:00
m.ray
f597048c43
feat(#994): market info - price monitoring bounds, calc 24h volume, oracle price & termination IDs etc. (#1050)
* feat: #994 add price monitoring bounds and candles update interface

* fix: move best bid price to diff section

* fix: add insurance pool and calc volume 24h

* feat: display some oracle min info, asset id, insurance pool, move open interest and 24hVol

* fix: add  market-info.cy.ts case

* fix: remove # from numbered price monitoring settings

* fix: add insurance pool test

* fix: format 24hvol

* fix: remove indicativeVolume and oracleSpecBinding from market info

* fix: add oracleSpecBinding back

* Update libs/deal-ticket/src/components/info-market.tsx

Co-authored-by: botond <105208209+notbot00@users.noreply.github.com>

* fix: memo yesterday's timestamp

* fix: memo timestamp on market info

Co-authored-by: botond <105208209+notbot00@users.noreply.github.com>
2022-08-23 12:43:53 -07:00
m.ray
d9e098f942
fix: add back apollo client code generate command (#1124)
* fix: add back appolo generate command

* fix: update to devnet API

* fix: revert to testnet changes

* fix: revert to testnet changes
2022-08-23 12:32:54 -07:00
Art
8bec78729b
fix(#1052): tooltip appears behind trigger (#1095) 2022-08-23 10:38:03 -07:00