Commit Graph

104 Commits

Author SHA1 Message Date
Radosław Szpiech
664c55960b
test: added missing block confirmation coverage (#1115) 2022-08-23 10:27:43 -07:00
m.ray
b6cda139df
chore: fix status mappings after API updates (#1119)
* chore(#1116 ): status mapping fixes after API changes

* fix: modify proposal status

* fix: update to use numbers in price cell rather than converting
2022-08-23 10:24:33 -07:00
Sam Keen
bb40a18e2b
feat(#1012): rejected proposals page enum change (#1118)
* Feat/1012: Rejected proposals page

* Feat/1012: Test for rejected proposals link on main proposals list

* Feat/1012: Translate 'see rejected proposals' link

* Feat/1012: Updated rejected proposals page with new enum

* chore: use proposalState enum

Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
2022-08-23 10:22:10 -07:00
Sam Keen
9979c25a13
feat(#1011): Filter rejected proposals rather than failed (#1051)
* Feat/1011: Filter rejected proposals rather than failed ones on proposals list

* chore: use enum for ProposalState.STATE_REJECTED

Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
2022-08-23 10:01:43 -07:00
Radosław Szpiech
696e1174bc
Test/866 add ac references to association tests (#1103)
* test: added ACs to existing tests

* test: add more association test to match coverage

* chore: missing braces added

Co-authored-by: Rado <rado@vegaprotocol.io>
2022-08-23 10:34:13 +02:00
Dexter Edwards
c70a273e0b
feat: 0.54.0 (#949)
* chore: remove stagnet2, add stagnet3

* fix: types for transaction order submission (#932)

* test: add night runs again (#917)

Co-authored-by: Rado <rado@vegaprotocol.io>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Feat/893 anchor per network param (#907)

* feat: highlight network param targeted by anchor

* Feat/893: Highlighted key-value row colours

* Feat/893: Removed unneeded important bangs

Co-authored-by: sam-keen <samuel.kleinmann@gmail.com>

* Fix/687: Jump to block input should not allow negative block numbers or 0 (#918)

* Fix/687: Jump to block input should not allow negative block numbers

* Fix/687: Jump to block input should have a minimum of 1

* fix: text and theme icon colors (#920)

* Fix/eager connection (#923)

* fix: eager connect

* chore: add comment for eslint disable

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Task/Remove vegawallet service api client (#916)

* chore: remove generated vegawallet client code and implement in rest connector

* feat: add zod validation

* feat: handle specific auth/token delete case

* feat: make withdraw dialog match vega tx dialog

* fix: response stub to be right shape, add content type to requests

* chore: revert unrelated classname change

* feat: [console-lite] - fixes in order margin calcs (#891)

* feat: [console-lite] - fixes in order margin calcs

* feat: [console-lite] - fixes in order margin calcs - fix decimals

* feat: [console-lite] - fixes in order margin calcs - add unit tests

* feat: [console-lite] - fixes in order margin calcs - improve cals

* feat: [console-lite] - fixes in order margin calcs - improve cals

* feat: [console-lite] - fixes in order margin calcs - more improvements

Co-authored-by: maciek <maciek@vegaprotocol.io>

* fix: make check link unclickable while loading (#928)

* fix: make check link unclickable while loading

* fix: format

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix/904: Validators sorting (#913)

* fix(790): gap between orderbook headers and tabs (#929)

* feat: show correct reward type (#930)

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Task/remove vegawallet service (#926)

* feat: improve error handling

* chore: lint

* fix: cypress test incorrect assertion

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix: order transaction types

Co-authored-by: Radosław Szpiech <szpiechrados@gmail.com>
Co-authored-by: Rado <rado@vegaprotocol.io>
Co-authored-by: mattrussell36 <mattrussell36@users.noreply.github.com>
Co-authored-by: Edd <edd@vega.xyz>
Co-authored-by: sam-keen <samuel.kleinmann@gmail.com>
Co-authored-by: Sam Keen <samuel@vegaprotocol.io>
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
Co-authored-by: macqbat <kubat.maciek@gmail.com>
Co-authored-by: maciek <maciek@vegaprotocol.io>
Co-authored-by: asiaznik <artur.siaznik@gmail.com>
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>

* test: fix test import

* chore: resolve bad merge files

* chore: begin enum changes

* test: fix the majority of the tests

* test: fix tests

* style: lint

* fix: update enums

* fix: adjusted tests to updated enums

* ci: bump capsule

* fix: temporarily skip failing staking tests

* ci: revert capsule changes

* test: fix tests for stats

* chore: merge few changes and api updates to stagnet3 updates branch (#1100)

* chore: merge few changes and api updates to stagnet3 updates branch

* chore: [console-lite] - fast fix in unit test

Co-authored-by: maciek <maciek@vegaprotocol.io>

* test: fix broken test

* chore: change to use the new nodes rather than load balancer

* style: formatting

* style: formatting

* chore: fix env file

* fix: don't assume GQL URL path

* fix: skip positions  query if there is no part

* fix: simple trading app test

Co-authored-by: botond <105208209+notbot00@users.noreply.github.com>
Co-authored-by: Radosław Szpiech <szpiechrados@gmail.com>
Co-authored-by: Rado <rado@vegaprotocol.io>
Co-authored-by: mattrussell36 <mattrussell36@users.noreply.github.com>
Co-authored-by: Edd <edd@vega.xyz>
Co-authored-by: sam-keen <samuel.kleinmann@gmail.com>
Co-authored-by: Sam Keen <samuel@vegaprotocol.io>
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
Co-authored-by: macqbat <kubat.maciek@gmail.com>
Co-authored-by: maciek <maciek@vegaprotocol.io>
Co-authored-by: asiaznik <artur.siaznik@gmail.com>
Co-authored-by: Joe <joe@vega.xyz>
Co-authored-by: m.ray <16125548+MadalinaRaicu@users.noreply.github.com>
2022-08-22 15:50:13 -07:00
Sam Keen
4a3b256456
Feat/1012 rejected proposals page (#1040)
* Feat/1012: Rejected proposals page

* Feat/1012: Test for rejected proposals link on main proposals list

* Feat/1012: Translate 'see rejected proposals' link
2022-08-22 17:25:40 +01:00
Sam Keen
b528cf08ed
Feat/1093: Visual tweaks to the validators table (#1098)
* Feat/1093: Validators form scrollbar more visible

* Feat/1093: Less tweaking, specific scrollbar styling

* Feat/1093: Auto sorting and manual sizing of validators form. Also added the correct comparators for the validator and status columns

* Feat/1093: A little extra spacing between epoch data and the validators table
2022-08-22 15:52:14 +01:00
Art
45ae06e4f2
fix: revealed splash screen informing about loading and error (803) (#1087) 2022-08-22 11:14:43 +02:00
Sam Keen
f158dbddaa
Feat/1077 link to associate page (#1092)
* feat/1077: Add a link to staking/associate from the staking page

* feat/1077: tweak
2022-08-22 09:35:17 +01:00
AndyWhiteVega
61e164e78c
Test/757 tfe add e2e tests for governance (#1085)
* test: initial commit

* test: lint

* chore: set different environement variable for rest url

* test: enable commented out steps

* chore: set base correctly

* chore: correct env var

* test: update to function

* test: lint

* test: governance flow

* test: lint

* test: extra tests

* fix: set fetchPolicy to not cache results so new proposals are updated

* test: update

* test: lint

* test: extra tests

* test: lint

* test: add wait and select proposal

* test: lint

* test: extra checks

* test: lint

* Revert "chore: use custom vega capsule file (#1055)"

This reverts commit 6b4b896bbc.

* test: final commit of initial tests

* test: removal of unused file

* test: before all change to reset before each test

* test: speed enhancement

* test: lint

* test: lint check fix

Co-authored-by: Dexter <dexter.edwards93@gmail.com>
2022-08-19 14:39:00 +01:00
Edd
3f474303b5
fix: ignore erroring epoch 0 data node endpoint (#1046) 2022-08-16 11:42:10 +00:00
Dexter Edwards
3de748a133
Revert "Revert "feat: show correct reward type (#930)"" (#969)
This reverts commit 2a584e862c.
2022-08-16 12:23:40 +01:00
Matthew Russell
44c628332d
fix: token app useSearchParams (#1014)
* fix: token app useSearchParams

* chore: typecast url params to enums for token app
2022-08-12 09:58:17 +02:00
botond
3e223c24a7
Fix/954: Token & Explorer decimals (#1006)
* fix: token governance percentage displays

* fix: add percentage displays to selected network params

* fix: format

* fix: majority rule and proposal required percentage defaults

* fix: format
2022-08-11 13:14:46 +01:00
Sam Keen
1be1a78a69
Feat/537: remove old contract for collateral bridge (#998)
* Feat/537: Removed old contract and branching logic for collateral bridge

* Feat/537: Renamed all 'new' name instances in functions, files and types. Regenerated types.

* Feat/537: Added 'creation' field to withdraw-dialog.spec.tsx test
2022-08-11 11:33:45 +01:00
Bartłomiej Głownia
f732e66546
Feat/986: extract routes from routes, lazy load all child routes 2022-08-10 09:50:15 +01:00
Dexter Edwards
eed6a83572
chore: show total supply on governance page (#967)
* chore: show total supply on governance page

* Update apps/token/src/i18n/translations/dev.json

Co-authored-by: Edd <edd@vega.xyz>

* Update apps/token/src/i18n/translations/dev.json

Co-authored-by: Edd <edd@vega.xyz>
2022-08-09 16:54:41 +01:00
m.ray
9a2ac6a8ac
chore: fix failing test on proposal-list.spec (#985)
* chore: add moduleNameMapper for d3 in token jest.config.js

* remove extra line of transform

* fix: use @testing-library/react not react-hooks
2022-08-09 14:25:47 +01:00
Sam Keen
4cd980f6bf
Feat/971: Add link to the make proposal form (#972)
* Feat/971: Add link to the make proposal form

* Feat/971: Basic render test for the page title and new proposal link
2022-08-09 11:07:12 +01:00
m.ray
71ede25339
chore: upgrade to React 18 (#952)
* chore: upgrade react only

* chore: import renderHook from testing-library/react

* chore: add @babel/runtime to fix tests

* fix: fix some of the tests

* fix: fix some of the tests

* fix: fix tests failing on not being wrapped in act

* fix: fix tests in use-environment

* fix:  fix @types/react issue

* fix: fix formatting

* fix: remove unsued method

* fix: callout not accepting react node and root element null check

* fix: main.tsx stats null check

* fix: implicit any type fixes

* Update libs/environment/src/hooks/use-nodes.spec.tsx

* fix:  import act from testing-lib

* fix:  add strict mode back

* fix:  fix formatting issues

* fix: add babel deps for storybook

* Update tsconfig.json (#970)

* Update tsconfig.json

* feat: [console-lite] - add missing types in few places

Co-authored-by: maciek <maciek@vegaprotocol.io>

* chore(#952): remove any from useDataProvider hook

Co-authored-by: macqbat <kubat.maciek@gmail.com>
Co-authored-by: maciek <maciek@vegaprotocol.io>
Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>
2022-08-09 10:43:11 +01:00
Dexter Edwards
2e644de413
fix: provider sometimes not having signer (#964) 2022-08-08 10:16:10 +00:00
Dexter Edwards
838c6c45c7
Release/token (#948)
* Revert "feat: show correct reward type (#930)"

This reverts commit 8644eac2be.

* fix: incorrect decimals in pending stake

* fix: use old bridge
2022-08-08 09:42:56 +01:00
Joe Tsang
181819fb24
Test/868 staking ACs (#939)
* test: staking validation tests

* chore: standardise codes

* chore: standardise codes

* test: additional ACs added and view tests mostly done

* chore: update codes

* test: staking tests passing

* chore: remove comments and formatting

* test: fix staking view tests

* fix: empty string assertion

* fix: lint

* chore: remove unnecessary assertions

Co-authored-by: Edd <edd@vega.xyz>
2022-08-05 17:59:44 +01:00
Sam Keen
c40d71e1ed
feat (#804): simple proposal form (#942)
* Feat/804: Routing and basic page setup

* Feat/804: Type definition for proposals - awaiting asset docs/changes

* Feat/804: New proposals lib

* Feat/804: Propose form and page

* Feat/804: Removing dud copied unit tests for now

* Feat/804: Added types for new asset proposal

* feat: handle new error types returned from wallet for proposals

* chore: rename lib to governance

* feat: move usage of hook into form component

* feat: some adjustments and test coverage

* chore: tidy up, remove tailwind config

Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
2022-08-05 12:01:46 +01:00
Artur
53c72b0eae
fix: walletconnect does not work (#935)
* fix: walletconnect does not work

* fix: walletconnect does not work

added buffer

* chore: moved global from env-config.js
2022-08-03 14:56:40 +01:00
Dexter Edwards
33a044e6ad
fix: governance page crashing when a freeform proposal exists (#941) 2022-08-03 13:00:41 +01:00
Dexter Edwards
8644eac2be
feat: show correct reward type (#930) 2022-08-01 17:35:09 +01:00
Sam Keen
76b3cdb312
fix/904: Validators sorting (#913) 2022-08-01 15:09:37 +01:00
Matthew Russell
4269060c9c
Task/Remove vegawallet service api client (#916)
* chore: remove generated vegawallet client code and implement in rest connector

* feat: add zod validation

* feat: handle specific auth/token delete case

* feat: make withdraw dialog match vega tx dialog

* fix: response stub to be right shape, add content type to requests

* chore: revert unrelated classname change
2022-08-01 09:21:31 +01:00
Matthew Russell
7e715d08ec
fix: text and theme icon colors (#920) 2022-07-29 17:50:32 +01:00
Sam Keen
3c8a0b182f
Fix/900: Validator list - pending stake formatted as per current stake (#901) 2022-07-29 10:08:02 +01:00
Dexter Edwards
4f3409c106
fix: broder colour wrong for tranches overview (#894) 2022-07-28 14:44:29 +01:00
Sam Keen
70aae5003d
Fix/898: Avatar images now only displaying if avatarUrl is valid (#899) 2022-07-28 14:43:17 +01:00
Matthew Russell
11be7aaa8a
refacotr: deposit manager (#867)
* refactor: deposit manager with a zustand store and refetching balances after contracts complete

* refactor: remove assetId query string functionality

* chore: remove unused import

* chore: add a comment with a link to code explanation

* refactor: capture errors from deposit value get functions

* refactor: add error handling for async perform funcs

* feat: add assets to react helpers for types and erc20 check
2022-07-28 13:23:59 +01:00
Radosław Szpiech
f1c3eab914
test(token): validations added for vega wallet widget (#885)
* test(token): validations added for vega wallet widget

* test: add missing vega wallet import

* test: add validation for url value

Co-authored-by: Rado <rado@vegaprotocol.io>
2022-07-27 16:46:30 +02:00
Sam Keen
e3dd73531c
Fix/872: Remove useThemeSwitcher from Token as it's redundant and was stripping dark class (#886) 2022-07-27 15:30:29 +01:00
Sam Keen
6382d3fb22
Fix/881: Removed testing message in proposals list voteStatus (#882) 2022-07-27 13:45:38 +02:00
Dexter Edwards
e275460c76
feat: allow default wallet url to be configured (#875)
* feat: allow default wallet url to be configured

* docs: add docs to environement package
2022-07-27 11:28:29 +01:00
Sam Keen
aa0be2b3e8
Feat/671 Proposal listings page (#733)
* frontend-monorepo-671: Removed old proposal list intro text

* frontend-monorepo-671: Proposals sorted into open and closed state

* frontend-monorepo-671: Proposals also sorted by date, and sorting functions memoized

* frontend-monorepo-671: Updated proposal header for new text and i18n support, updated test

* frontend-monorepo-671: Eth wallet connect button full width

* frontend-monorepo-671: Proposal tests for primary text fixed

* Frontend-monorepo-671: Updated proposal description and tests. Included translations

* Frontend-monorepo-671: Small structural refactor

* frontend-monorepo-715: Added required translations

* frontend-monorepo-715: Proposals list item details

* frontend-monorepo-715: Proposals list item styling

* frontend-monorepo-671: Tests for proposals-list-item-details.tsx

* frontend-monorepo-671: Tests and tweaks for proposals-list.tsx

* frontend-monorepo-671: Reusable test components pulled into test-helpers

* frontend-monorepo-671: Proposals list text filter and tests (partially working tests)

* frontend-monorepo-671: Refactoring generateProposal to clobber rather than merge old arrays

* frontend-monorepo-671: Readded commented out tests

* frontend-monorepo-671: Removed empty files

* frontend-monorepo-671: Made more use of generateProposal overrides

* frontend-monorepo-671: Run prettier

* frontend-monorepo-671: Fixed linting errors

* frontend-monorepo-671: PR suggestions

* frontend-monorepo-671: Used 'describe' and improved test descriptions

* frontend-monorepo-646: PR improvement

* frontend-monorepo-671: Tweak to basic cypress tests

* Frontend-monorepo-45: Adjusted proposal filter and tests to remove rationale

* Frontend-monorepo-45: Removed accidentally duplicated test

* frontend-monorepo-671: More clarity for freeform proposal header

* frontend-monorepo-671: resolve master

* frontend-monorepo-671: Added issue number in comment for proposal rationale

* frontend-monorepo-671: Added issue number in another comment for proposal rationale

* frontend-monorepo-671: Mock timers added for proposals-list-item-details.spec.tsx

* frontend-monorepo-671: Mock timers added for proposals-list.spec.tsx

* frontend-monorepo-671: Improved styling to differentiate open vs closed proposals

* Fixed previous incorrect resolution of master
2022-07-26 21:10:49 +01:00
Sam Keen
6f374264c0
Feat/45 - Validator list (#833)
* frontend-monorepo-45: Removed party data from validators table

* frontend-monorepo-45: Removed redundant query fields

* frontend-monorepo-45: Validator AG Grid working and fields formatted

* frontend-monorepo-45: Removed old node list tests (as now handled by AG Grid)

* Frontend-monorepo-45: Removed unwanted auto-added imports

* Frontend-monorepo-45: Fixing cypress tests

* Frontend-monorepo-45: Removed unnecessary class added as part of layout test

* Frontend-monorepo-45: Removed unnecessary refactor added as part of layout test

* Frontend-monorepo-45: Removed unnecessary grid export added as part of grid setup

* frontend-monorepo-45: Removed unwanted font-size and adjusted avatar size in proportion

* frontend-monorepo-45: Expanded node-list tests

* frontend-monorepo-45: Used toString on translations to make node list coldefs a bit clearer

* frontend-monorepo-45: Converted nodeFactory to use lodash merge and PartialDeep

* frontend-monorepo-45: Refactored so node list AG grid field names are decoupled from translations

* frontend-monorepo-45: Added refreshing when epoch changes

* frontend-monorepo-45: Used epoch data already passed to node list instead of a new query

* frontend-monorepo-45: Node list - used formatNumber from libs/react-helpers

* frontend-monorepo-45: formatNumber now accepts BigNumbers
2022-07-26 20:26:12 +01:00
Matthew Russell
b7f08def47
refactor: handle Ethereum dialog state from hook (#851)
* refactor: pass dialog down from hook

* feat: convert dialog to be returned as component

* chore: fix linting
2022-07-25 14:23:20 +01:00
Matthew Russell
e47298761a
Feat/Use callStatic to improve error messaging (#831)
* feat: make use max only use account balance, add custom max messages

* fix: withdraw threshold limit display

* feat: add callstatic to ethereum transaction hook

* feat: improve types for useTransaction hook

* chore: fix types and remove ts-ignore

* chore: convert all smart contract wrapper methods to match metaclass methods

* fix: this context for calling tx

* chore: fix comment and any type

* chore: typo

Co-authored-by: Edd <edd@vega.xyz>

Co-authored-by: Edd <edd@vega.xyz>
2022-07-25 09:48:19 +01:00
Matthew Russell
9ae2d6a8fa
chore: remove rationale field from proposals query (#817) 2022-07-19 17:31:46 +01:00
Matthew Russell
7c2a84805e
fix(#441): withdraw fixes
* chore: make sure etherscan links open in new tab

* fix: format withdrawal amount correctly in table

* fix: switch to use next Link element so page state not lost

* fix: calc deposit max validation using ethereum storage at

* fix: remaining amount in deposits and refetch allowance

* fix: page background in dark mode

* chore: disable autocomplete for ethaddress

* fix: bump ag grid row size so underline is shown on FF

* fix: expect correctly formatted withdrawal amount

* fix: missing react keys in maps

* fix: complete button text in test

* fix: use sentry/react, fix webpack config path
2022-07-18 22:11:53 +01:00
Sam Keen
936f849cef
Feat/Intro to staking page (#736)
* frontend-monorepo-646: Staking intro tweaked and tests amended

* frontend-monorepo-646: Sorting grid placements and setting a fixed width for the main content area on larger screens

* frontend-monorepo-646: Removing some redundant elements and tweaking some tests

* test: fixes ahead of ui changes

* test: lint

* test: remove unused import

* test: renabling tests

* test: fixes

* test: fixes to catch up with last PR

* test: removal of tests no longer required

* test: removal of unused import

* Update apps/token/src/i18n/translations/dev.json

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

* frontend-monorepo-646: Updated staking text

Co-authored-by: AndyWhiteVega <andy@vegaprotocol.io>
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
2022-07-18 14:12:36 +01:00
candida-d
b80cbc916b
chore: add context to "no VEGA" message (#793) 2022-07-18 13:00:18 +01:00
Michael Campbell
ff68c878d0
rename and new links + taxt (#782) 2022-07-18 12:35:44 +01:00
AndyWhiteVega
85c3eff31e
Test/746 expand coverage of tfe tests (#759)
* test: adding extra checks within tests

* test: lint

* test: refactor to bring assertions inline with new wallet locators

* test: lint

* test: lint correction

* test: formatting for lint

* test: formatting for lint

* test: fix test and make use of common functions

* test: lint
2022-07-14 15:21:51 +01:00
Dexter Edwards
e0f01f530f
fix: white text on disconnect screen (#753)
* fix: white text on disconnect screen

* fix: white text on something went wrong page
2022-07-13 15:58:25 +00:00