* feat: update validation for size and price so they are reported simultaneously
* feat: adjust styles so error messages for price/size are rendered on one line
* fix: missing key in map error
* feat: split validation out on a field by field basis
* refactor: remove unnecessary price setting and just use props to calc market price
* refactor: rename setOrder func and add a comment
* chore: add type for form fields to allow for summary field
* fix: layout of market order size and price
* fix: casing of size/price in validation message
* refactor: fix type errors for summary react nodes and for tif and type validation
* feat: break out functions for testing market.state and market.tradingmode on submit
* fix: deal ticket test for last price value
* chore: remove unused files and move hooks and utils to correct dirs
* chore: tidy up constants
* fix: const before enum invalid syntax
* feat: dont block submission if not enough margin but do if zero balance
* chore: remove duplicated margin warning message
* feat: dont allow margin warning and error message to render at the same time
* feat: make trading mode check just a warning rather than error message
* test: make markets active so they are tradable, renaming describe blocks for clarity
* test: adjust test ids and disabled state and fix tests
* test: include AC codes in tests
* chore: remove click of in test as form is already dirty
* fix: lint errors, only show margin warning if you have balance
* chore: add ts ignore
* chore: re add use-order-validation hook for console-lite specifically
* chore: update use-order-validation test after consumed margin check hook changed
* fix: circular deps issue in console-lite
* chore: update use order validation hook to use Schema rather than direct import
* fix: migrate queries to latest apis
* fix: remove oracles section for now
* fix: dive in to fields correctly
* fix: update queries
* fix: fragment for stats fields
* fix: rename triple underscore generated
* chore: refactor types that have moved
* chore(explorer): disable e2e test that asserts json structure
* feat(#580): add link to update market proposal
* feat(#580): fix cypress test for propose a change to market link
* feat(#580): fix market info proposal update cypress test
* feat: filter assets to withdraw
* feat: filter assets to withdraw - add some test
* feat: filter assets to withdraw - add some test
* feat: filter assets to withdraw - add logic for filtering out zero balanced accounts
* feat: filter assets to withdraw - add logic for filtering out zero balanced accounts
Co-authored-by: maciek <maciek@vegaprotocol.io>
* chore: updates to accomodate change to datasource apis
* chore: update types for proposal submission
* chore: update queries to work with latest core changes
* chore: make liquidity page client side only
* chore: switch to hash based router
* chore: add index files for each page
* chore: tidy up _app
* chore: convert to use useRoutes
* fix: active state with react-router NavLink
* feat: add routes enum
* chore: restrict link and router imports from next
* chore: update testing navigation to use hash routes
* fix: typoe in eslint rule message
* chore: remove unnecessary getInitialProps function definition
* chore: wrap tests with memory router
* chore: delete unused index.page file
* chore: update suspense fallback state
* chore: add comment for link component span usage, update link to use toolkit styles
* chore: fix lint issues
* chore: delete client deposit page
* chore: revert title in _app so title gets set correctly without rerender
* revert: removal of deposit page so deposit e2e tests still pass
* chore: move client router to index page so valid status codes are still sent
* fix: wrong route path for markets page, cypress tests
* feat: #1659 add link to market in orders table
* feat: #1794 use volume 24h instead of indicative volume
* fix: remove total fees that was defined but not used in select columns
* fix: fix cypress test for volume (24h) header
* fix: add volume 24h tooltip
* fix: trading mode and volume order
* fix: #1486 move deal ticket hooks from console-lite to be re-used in trading app for console v2
* fix: #1486 typo
* feat: #1486 deal ticket query update, console-lite fix
* feat: #1486 console-lite fix
* feat: #1486 initial hook to get fee details
* feat: #1486 add tooltips
* feat: #1486 add fees cell from market-info in tooltip
* fix: #1486 edit deal-ticket.spec.ts titles and index.ts of deal ticket hooks
* feat: #1486 move all hooks for slippage into deal ticket
* fix: #1486 fix linting deal-ticket issue
* fix: set price, fix NaN percentage, watch full order object
* fix: update only when market price is updated
* feat: #1486 add fees from est. order query, fees breakdown, fix BigNumber NaN issue
* feat: #1486 add fee factors in generate deal ticket query
* fix: #1486 show margin on short
* fix: #1486 format price and fix dal ticket use order margin import
* fix: #1486 fix price memo
* feat: #1486 update estimate ordr query with order price or mark price
* fix: #1486 revert apps/console-lite/.env
* fix: #1486 fix NaN value on close out
* fix: #1486 revert close out calculation
* fix: #1486 prevent NaN close out
* fix: #1486 revert close out
* feat: #1486 add fee factor percentages in tooltip and fix NaN
* fix: #1486 fix deal-ticket-steps est close out null handling
* fix: #1486 fix deal-ticket-steps est close out null handling
* fix: #1486 add tooltip for fees
* fix: #1486 fix console-lite formatting on notional size and close out
* fix: #1486 total fees formatting inside the hook
* feat: #1486 add qutote to fees tooltip
* fix: #1486 update hook, price, console-lite and styling
* chore: fix mock types
* fix: #1486 fix tests in console-lite
* fix: #1486 add declaration.d.ts to console-lite-e2e
* fix: #1486 fix deal ticket test
* fix: #1486 fix deal ticket test
Co-authored-by: Rado <szpiechrados@gmail.com>
* chore: fix for persist force value selection after change of order type
* chore: fix for persist force value selection after change of order type fix some int test
* chore: fix for persist force value selection after change of order fast fixes
Co-authored-by: maciek <maciek@vegaprotocol.io>
* chore: single position table (1645)
chore: single position table (1645)
* chore: tests fixed
* chore: remove unused withSummaryRow arg
* chore: use ag grid value formatter type helper
* chore: update console-lite to use value formatter params helper
* chore: fix e2e test by ignoring pinned row
Co-authored-by: Rado <szpiechrados@gmail.com>
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
* feat: add connect vega wallet button to the deal ticket
* feat: add connect vega wallet button to the deal ticket - manage some int tests
Co-authored-by: maciek <maciek@vegaprotocol.io>
* chore: break down components to smaller chunks for better performance
* chore: break down components to smaller chunks for better performance
* chore: break down components to smaller chunks for better performance - fix failing tests
* chore: break down components to smaller chunks for better performance - adjust token app cases
* chore: break down components to smaller chunks for better performance - small fixes
* chore: break down components to smaller chunks for better performance - small fixes
* chore: break down components to smaller chunks for better performance - small fixes
* chore: break down components to smaller chunks for better performance - small fixes
* chore: break down components to smaller chunks for better performance - add nwe store for pageTitle
* chore: break down components to smaller chunks for better performance - sm fix
* chore: break down components to smaller chunks for better performance - sm fix
* chore: break down components to smaller chunks for better performance - sm imprv
* chore: break down components to smaller chunks for better performance - change prop names
* chore: break down components to smaller chunks for better performance - fix some test
* chore: break down components to smaller chunks for better performance - change cypress url
* chore: break down components to smaller chunks for better perf - set back redundant changes
* chore: resolve conflicts
Co-authored-by: maciek <maciek@vegaprotocol.io>
* feat: #1648 add deposit button and show accounts 0 state
* fix: remove text-white and text-black
* fix: #1648 revert and add back row model type and data source in accounts table
* fix: #1648 fix linting issue
* fix: #1648 table tweaks buttons at the bottom
* fix: #1644 hide withdrawals history title
* fix: #1648 fix accounts-table test
* fix: #1648 fix trading-accounts.cy.ts test
* fix: leave ag grid to show overlay if data is simply null but there is no error or it's not loading
Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>
* chore: market header live update
* chore: market header live update
* chore: market header live update - adjust some mocks
* chore: market header live update - add single market query
* chore: market header live update - small fixes
* chore: market header live update - fix int tests
* chore: market header live update - fix int tests
* chore: market header live update - remove unnecessary props from query
* chore: market header live update - change concept - split for small comps
* chore: market header live update - small fix for mocks
* chore: market header live update - fix updates throttling
* chore: market header live update - improve update methods of data providers
* chore: market header live update - improve update methods of data providers
* chore: market header live update - improve update methods store for get rid of blinking
* chore: market header live update - fix title component
Co-authored-by: maciek <maciek@vegaprotocol.io>
* fix: make sparkline appear after change cell
* fix: make price come after expiry in market header
* fix: refer to size rather than amount in validation
* fix: radio colors in light theme
* fix: remove orange border from vega tx pending state
* chore: combine deposit and withdraw buttons into single cell
* chore: update accounts table test, remove console warning from breakdown tests
* chore: update order validation test
* chore: place market table header in correct position
* chore: use actual change id to avoid clash
* fix: remove assertion in fills table that is flakey
* chore: render fills table with act
* fix: add a wait time for infura queries to resolve
* chore: seoplia migration
* fix: remove trailing slash from etherscan urls
* fix: make mock assets for withdraw form real assets so working with infura works
* chore: remove stray screen.debug
* fix: global mocks for chainid
* fix: add additional chain id mock for withdrawals page
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
* feat: inserts of new item in positions
* feat: inserts of new item in positions - move select-market to app dir
* feat: inserts of new item in positions - add delta to update
* feat: inserts of new item in positions - fix e2e mocks
* feat: inserts of new item in positions - fix e2e mocks
* feat: inserts of new item in positions - adjust e2e mocks
* feat: inserts of new item in positions - adjust e2e tests
* feat: inserts of new item in positions - adjust e2e tests
* feat: inserts of new item in positions - adjust e2e trading tests
* feat: inserts of new item in positions - adjust e2e account tests
* feat: inserts of new item in positions - adjust e2e account tests
* feat: inserts of new item in positions - adjust e2e account tests
* feat: inserts of new item in accounts - manage inserting new accounts
* feat: inserts of new item in accounts - adjust console-lite tests
* feat: inserts of new item in accounts - adjust console-v2 tests
* feat: inserts of new item in accounts - adjust console-v2 tests
* feat: inserts of new item in accounts - clean up after merge
* feat: inserts of new item in accounts - fixes after feedback
Co-authored-by: maciek <maciek@vegaprotocol.io>
* feat: update connect dialog to handle api v2
* feat: better error handling
* feat: update to only use strings for pubkey, add json rpc connector
* feat: make json connector follow same patterns as rest connector
* feat: add ability to change wallet location
* feat: add chain id fetch
* feat: improve types
* feat: adjust send tx types
* chore: remove dialog title and chain check temporarily
* feat: additional UI and error handling
* feat: rename keypair and keypairs to pubKey and pubKeys
* feat: make rest and json rpc connectors return consistent data
* feat: rename derived ids more clearly
* feat: update send_transaction response type
* chore: fix tests after context name change
* feat: add utils for wallet, add encode tx func
* feat: return null if tx is rejected
* feat: fix up styles for connect buttons
* feat: handle wallet version check
* feat: add chain id check
* chore: rename select pub key function to match, fix tests
* fix: tests for rest connector form
* feat: add tests for json rpc flow
* feat: connect dialog changes
* chore: change status to enum to avoid magic strings
* feat: add custom icons and handle provided key name
* chore: update global wallet connection e2d tests
* chore: change zod validation to only expected required values
* chore: ignore new generated code files
* chore: fix typos and add translations
* chore: set hosted wallet via env var and only show if not mainnet
* feat: add functionality for try again button
* test: fix failing tests
* chore: fix lint and test
* chore: remove double import
* chore: make console-lite-e2e strict so json connector compiles correctly
* chore: make token e2e tsconfig strict
* chore: make stats-e2e tsconfig strict
* feat: update json rpc request namespace
* feat: simplify connector setup, support try again
* chore: remove comment
* fix: build errors
* chore: make chainId check optional based on presence of appChainId, mock request for tests
* chore: mock chain id request for all apps on all pages
* fix: footer border on small screens
* fix: use beforeEach for chainId query mock
* chore: remove optional chain check, prevent rendering until fetch is complete
* chore: update NX_VEGA_WALLET_URLs as the application now appends the base path, adjust token tests
* fix: token e2e test that checks for pubkey name
* chore: remove duplicated test, update wallet title assertion
* fix: token tests
* fix: token e2e assertions
* fix: withdraw test
* feat: enable json RPC for token
* fix: sendTx command now accpets pubkey as separate arg
* fix: test to use gui option temporarily
Co-authored-by: Dexter <dexter.edwards93@gmail.com>
* feat: allow second type arg to be generic as you dont always need the value
* feat: update order data provider to include fields required to determine if editable or cancellable
* feat: use ag grid type helpers and add rendering logic to cancel and amend buttons
* feat: combine cancel/edit buttons into single cell for better spacing
* feat: add test cases for dispaly of amend/cancel buttons
* chore: add missing fields to mock generate function
* chore: remove unnecessary wait for in fills test that was sporadically failing
* fix: add missing fields to generate order function
* fix: add missing fields to generate order function for console-lite
* chore: use new GQL candle fields
* Revert "chore: downgrade to 0.55 (#1406)"
This reverts commit cc7a4f2ddd.
* chore: update queries to be compatible with 0.56
* fix: update positions data provider to use only marketId field, omit new position insertion for now
* fix: regen types after merging candles query update
* chore: remove unused generated files
* chore: check for null markets connection
* fix: import errors
* chore: export types from market-list, disable unrelated failing tests
Co-authored-by: johnwalley <john@walley.org.uk>
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
* feat: added asset details dialog to market select (1226)
* Update libs/ui-toolkit/src/components/dialog/dialog.tsx
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
* removed focus complexity from popover, refactored
* chore: after rebase fixes
* fix: fixed console-lite asset details dialog func - after rebase
* fix: added mock for one failing test, removed console.log
* fix: removed increased timeout - not needed
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
* chore: disable video record for token e2e
* chore: disable videos in all tests
* fix: change main-branch-name to base-ref
* chore: disable capsule being run when not necessary
* fix: missing true
* chore: fix typo
* chore: fix if contruction
* chore: fix env
* chore: fix envs
* chore: try to fix develop ref
* fix: border too thick, use grid head component
* fix: unused and superfluous classes, define border color in one place
* fix: tooltip should be on data not label
* 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
* fix: route to LP and update selected market
* fix: add market-info lib
* fix: add tooltips to header stat
* fix: add overflow-y on div within auto sizer
* fix: fix merge conflicts
* fix: size and dialog
* fix: format target stake and supplied stake
* fix: add tooltips ag-grid and fix decimals
* fix: overflow on both axes auto-sizer
* fix: remove symbol, add to commitment
* fix: update tooltips and headers after demo
* fix: network switcher background
* fix: remove any from market info
* fix: integration test
* fix: remove e2e test for risk factors for now until grpc error sorted
* fix: get liquidity panel by test-id
* fix: fix market-info.cy.ts test
* fix: liquidity test
* f
ix: fix link data test id
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>
* 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
* feat: migrate assets to use new code generator
* fix: generated imports
* fix: lint
* fix: accounts export
* fix: more imports
* fix: add type alias for new type system and regenerate
* fix: format
* fix: export
* fix: format
* fix: delete leftover file from merge
* chore: migrate candles-chart lib
* fix: remove redundant asset files
* chore: migrate accounts
* chore: update glob
* chore: add cleanup to fix-imports to support type migrations for now
* fix: imports
* fix: update market types
* fix: type import paths
* fix: format
* fix: import
* fix: types in e2e tests
* fix: format
* fix: lint
* test: update market info tests
* test: update withdrawal test to include new info
* chore: re add withdrawal mock
* chore: wait for mock
* chore: change cypress browser to electron
* chore: resolved pr comments
* chore: replaced market name with tradable instrument name (1259)
* removed lodash import that must have added itself magically
* =aligned cypress tests with code changed
* =aligned console lite cypress mocks to the code changes
* changed cypress market info key details test
* changed cypress market info key details test
* generate markets for console lite
* 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
* 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>
* 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
* 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>
* 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>
* 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>
* fix: update appolo client and set key fields for instruments
* fix: use in-memory cache and tradable instrument id
* fix: revert switch case
* fix: add more info in gen market list for home.cy.ts
* fix: instrument keyfield still false
* fix: revert simple trading app and explorer updates - fixing tests
* fix: remove id from instrument data provider in simple trading app
* fix: remove id from market selector market names query
* Update apps/trading-e2e/src/support/mocks/generate-market-list.ts
* Update apps/trading-e2e/src/support/mocks/generate-market-list.ts
* Update apps/trading-e2e/src/support/mocks/generate-market-list.ts
* Update apps/trading-e2e/src/support/mocks/generate-market-list.ts
* feat: use MarketList query only
* fix: remove Market.ts from index
* feat: 30 refactor dialog, market list, change query
* feat: #30 add indicativeVolume, total fees, tooltip, large dialog, tooltip accepts html description
* fix: #30 total fees display in tooltip
* fix: #30 toggle title on dialog open
* fix: #30 fix order, price, high, low utils
* fix: #30 fix test for market utils
* feat: #30 add popover with markets to select
* feat: #30 storybook popover
* feat: #30 remove border on trigger and add some other classes
* fix: #30 fix format check with format:write
* feat: #30 add tooltip on taker fee
* feat: #30 add tooltip on taker fee
* fix: #30 format on select market list
* fix: #30 remove unknown cast in test mock data
* fix: #30 show markets where you have open positions
* fix: #30 double check if open positions
* fix: #30 dialog has only small/large sizes
* feat: #30 add border on trigger and change padding and no wrap
* fix: #30 if fees or factors are not found
* fix: #30 remove markets.cy tests as markets page is now gone
* fix#30 remove view full market list test
* fix: #30 add rotating arrow on market title
* fix: #30 add ease-in-out on popover
* fix: #30 add ease-in-out on popover
* fix: #30 align select a market table
* fix: #30 select a market title
* fix: #30 select a market title
* fix: #30 fix any validateDOMnesting issues
* fix: #30 show loading market data
* fix: #30 add list of header columns
* fix: #30 add list of header columns
* fix: #30 small refactoring after review
* fix: #30 update bold undreline class names
* fix: #30 add large-mobile size
* feat: #30 refactor select markets tables to render array of columns
* fix: #30 remove size from select market dialog
* fix: #30 add extra file for columns
* fix: #30 update formtting
* fix: #30 make sure popup closes on same market navigation
* fix: rename market-utils, add calcCandle methods, store market id on select
* fix: useMemo ondata and marketPositionData + orderbook stories fix
* feat: #30 add open volume positions
* fix: add market summary back
* fix: update formatting
* fix: use currentcolor on arrow
* fix: create all markets page
* fix: add overflow-y auto
* fix: enlarge select market to get started dialog
* fix: revert markets container
* fix: use query to fix flickering on position markets
* fix: edit unordered list in tooltips
* fix: fix tooltip table
* fix: fix home.cy.ts
* chore: skip /markets tests
* feat: remove dialog state handling from dialog and split out edit dialog
* feat: add complete state to use-vega-transaction, fix cancel dialog
* feat: add custom dialog content for order submission
* feat: handle custom title and custom intent
* feat: separate components, make order dialog wrapper more generic
* feat: remove dialog wrapper and add icon to dialog
* chore: remove other dialog wrappers and use icon and title props on main dialog
* chore: adjust default color of dialog text
* fix: tests for tx dialog and vega tx hook
* fix: order edit and cancel hook tests
* chore: add edit dialog to stories
* fix: e2e test for deal ticket
* feat: return dialog from hook
* refactor: add use-order-event hook to dedupe bus event logic
* refactor: add custom title and intent to order submit dialog
* chore: remove console logs
* fix: type error due to component being named idalog
* chore: add helper function for converting nanoseconds
* chore: remove capitalization text transform to dialog titles
* chore: remove unused import
* feat: handle titles and intents for cancel and edit
* chore: remove unused var
* chore: fix remaning text for large number
* feat: make use max only use account balance, add custom max messages
* fix: withdraw threshold limit display
* fix: assertions in deposit withdrawy e2e tests
* feat: add disconnect feature form ethereum wallet
* fix: unit tests
* fix: format
* fix: format
* fix: e2e withdrawal check
* fix: format again
* fix: eth address in e2e
* fix: env var for eth address
* feat(#218): add skip pagination support to data provider
* feat(#218): add new rows after user scroll top
* feat(#218): add pagination/scroll scenarios to storybook
* feat(#218): switch fills to infinite scroll mode
* feat(#218): switch trades to infinite scroll mode
* feat(#218): fix e2e tests
* feat(#218): set rowModelType to infinite
* feat(#218): fix markets-list
* feat(#218): remove totalCount
* feat(#218): remove totalCount from mocks, revert cypress config
* feat(#218): allow null data in data-provider whan using pagination
* feat(#218): add missing hasNextPage, handle only one page scenario
* feat(#218): improve typing in fills, trades ann market-list tables
* 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
* fix: #603 filter out rejected markets & dialog lg width
* fix: #609 show trading mode Continuous Trading and hide market state
* fix: #656 modify order validation to trade when suspended
* fix: #656 fix use order validation tests
* fix: #656 format volume no
* fix: format volume with positionDecimalPlaces
* fix: tests don't need to be async
* fix: md:w-[720px] to prevent dialog overflow
* fix: add market state translations
* fix: imprt type validation props
* Update libs/orders/src/lib/order-hooks/use-order-validation.tsx
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
* Update libs/orders/src/lib/order-hooks/use-order-validation.tsx
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
* Update libs/orders/src/lib/order-hooks/use-order-validation.tsx
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
* Update libs/orders/src/lib/order-hooks/use-order-validation.tsx
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
* Update libs/orders/src/lib/order-hooks/use-order-validation.tsx
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
* Update libs/orders/src/lib/order-hooks/use-order-validation.spec.tsx
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
* Update apps/trading/pages/markets/__generated__/Market.ts
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
* fix: fix warning messages based on feedback
* fix: capitalize trading mode
* fix: capitalize trading mode
* fix: remove line 72 on markets.cy.ts
* fix: don't show trigger if unspecified
* fix: format last price and shrink 0 on warning icon
* fix: order sizes must be whole numbers for this market and input warning size 20
* fix: order sizes must be whole numbers for this market and input warning size 20
* fix: format market list
* fix: remove market state check from markets.cy.ts
* fix: remove market state check from markets.cy.ts
* fix: remove market state check from markets.cy.ts
* Revert "fix: remove market state check from markets.cy.ts"
This reverts commit c9ab55c98a.
* Revert "fix: remove market state check from markets.cy.ts"
This reverts commit be60e56d8a.
* fix: fix markets.cy.ts failing
* fix: fix markets.cy.ts failing
* fix: fix markets.cy.ts failing
* fix: remove extra test from markets.cy.ts
* fix: update extra test from markets.cy.ts
* fix: update extra test from markets.cy.ts
Co-authored-by: candida-d <62548908+candida-d@users.noreply.github.com>
* feat: handle withdrawal limits
* feat: add withdraw limit ui to withdraw form
* chore: lint error
* fix: mock network param query for e2e tests
* fix: wrong translation in tests
* fix: withdrawals test and revert change in text for trade grid elements
* fix: add check for signature length before progressing withdraw
* chore: change tab panel background and spacing
* chore: prevent tabs shiting on click, bg tweak
* chore: adjust chrome layout/spacing
* chore: fix horizontal alignment when accordion chevron rotates
* chore: adjusting bold levels and making market name pink on light theme
* chore: changing white theme header to black background
* chore: re-ordering bottom tabs
* chore: tweaking font sizes
* chore: adjusting dropdown button hover colour
* chore: colour tweaks for accessibility, plus orderbook column widths
* Remove redundant style
Removed 'bg-white' left by error.
* Setting header text to white
* chore: alterative fix to prevent tabs moving
* chore: fixing header font colours
* chore: adding padding to orderbook
* chore: preventing modal close icon from moving on focus
* chore: remove inner shadow from selectbox
* chore: adding padding to orderbook
* chore: preventing @ sign from moving when changing order type
* chore: fix background colour on smaller responsive view
* chore: fix truncated market header on smaller responsive view
* chore: reorder tabs in smaller responsive view to match standard view
* fix: fix broken test
* feat: 470 edit orders hook and @vegaprotocol/vegawallet-service-api-client@0.4.14
* fix: 470 add methods for dialog intent and title
* fix: #657 rename order-list lib to orders
* chore: #657 move hooks to orders lib
* chore: #657 vega tx dialog used for order cancellation and order submission
* chore: #657 use client subscribe and unsubscribe on reset, refactor vegatxdialog
* fix: #657 revert script src=./env-config.js ending
* fix: #657 format project.json
* Update project.json
* fix: #657 cancel all subs and async tasks in useffect cleanup function
* feat: #657 styling updates on vega order dialog
* fix: #657 rename set dialog open and awaiting confirmation dialog update
* fix: #657 updates on cancel order id check
* fix: #657 fix vega tx dialog test
* fix: #657 fix cypress trading-deal-tciket test
* fix: #657 fix data-testid market test
* Update libs/orders/README.md
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* Update libs/wallet/src/vega-order-transaction-dialog/vega-order-transaction-dialog.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* Update libs/wallet/src/vega-transaction-dialog/vega-transaction-dialog.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* Update libs/wallet/src/vega-order-transaction-dialog/vega-order-transaction-dialog.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* Update libs/wallet/src/vega-order-transaction-dialog/vega-order-transaction-dialog.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* fix: #657 remove the magic string and use the ordertype enum from types package
* fix: #657 guarantee that order.id is present at this point or we need to determine the id of the order
* fix: #657 fix translation in dialog
* fix: #657 rename wallet types, delete ticket query, set finalized order null in submit
* fix: #657 fix deal ticket steps test
* fix: #657 remove settings.json
* fix: #657 use order submit in orders lib
* fix: #463 final modal links to block explorer
* fix: #745 long/short instead of buy/sell
* fix: #657 use only one vega tx dialog
* fix: #657 keep ref of subscription and unsubscribe
* fix: #657 hide cancelled orders
* fix: #657 sub only when id set
* fix: WIP: trying to unsub when order updated
* fix: #745 long/short instead of buy/sell
* fix: ensure observable defined
* fix: #657 remove redundant test
* Update libs/orders/src/lib/order-hooks/use-order-submit.ts
* fix: failing test due to resizeobserver loop limit exceeded
* fix: lint
* fix: #657 fix test resize observer loop limit exceeded
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
Co-authored-by: Joe <joe@vega.xyz>
* test(token-e2e): initial commit
* test(token-e2e): lint
* test: function Enhancements
* test: linting
* test: remove custom command type decs
* test: more tests
* test: linting
* test: working with capsule still needs rounding issues sorting
* test: enhancements
* test: enhancements
* test: check enhancements
* test: add brdige logic
* test: share instance rather than recreating on each test
* test: minor bug fix, add comment
* test: ensure working against capsule
* test: teardown functions in place
* test: linting
* test: completion of first iteration of happy paths
* test: lint
* test: typo change
* test: tweaks
* test: fix merge issues
* test: lint
* test: env variable handling and cleanup
* test: lint
* test: enhancements to logging to aid debugging
* test: lint
* test: ehancements after feedback
* test: lint
* Update apps/token-e2e/src/support/wallet-teardown.functions.js
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* test: skipping non-essential tests to reduce time
* test: typo
* test: ci test fails coz capsule runs quicker their - disabled this one check to help
* test: reduction of coverage to help PR time
* test: disable infinte scroll test since capsule blockchain data to small
* test: corrected test: staked tokens field value no longer in a fixed state
* test: clearup to stop test bleed across projects plus bugfix
* test: lint
* test: update .env for trading
* Revert "test: update .env for trading"
This reverts commit 741743e4d2.
Co-authored-by: Dexter <dexter.edwards93@gmail.com>
* feat: scaffold fills components
* feat: add query for fills and populate data in basic table
* feat: refactor portfolio page to use grid and add fills container
* feat: add infinite scroll for fills
* feat: try with data provider, get infinite scroll working
* chore: remove infinite scrolling as subsequent pr will add it
* chore: reorder columns
* chore: remove Autosizer from portfolio grid children as its not needed
* chore: move fills tab to the end
* feat: add storybook, format cells
* feat: add unit test for fills table
* feat: convert lib to next lib
* feat: add pagination variables to fills query to only get latest 300
* fix: fills data provider update function to return result of produce
* fix: yarn.lock
* fix: cypress run by moving test helpers
* fix: re add test helpers for unit tests
* fix: global connection tests
* fix: use fills from mocks
* feat: add update handler for fills
* chore: move value formatter functions into module scope
* chore: [#471] update @vegaprotocol/vegawallet-service-api-client to 0.4.12
* fix: [#471] set up storybook in order-list lib and add tailwind
* fix: [#471] organize order list components
* chore: [471] pull theme switcher changes
* feat: [#471] add cancel order button
* feat: [#471] initial impl of use order cancel hook
* fix: [#471] fix format of the price in order list
* fix: #471 fix static assets issue when merging
* fix: #471 refactor order dialog to vega tx dialog
* fix: #471 move use cancel order hook in wallet lib
* fix: [#471] cancel order dialog and hook refactor
* fix: [#471] remove commented code from storybook preview and fix test
* fix: [#471] update order-list.tsx
* fix: [#471] fix update subscription - show order is cancelled
* fix: [#471] fix eslint error
* chore: [#471] refactoring and add tests for dialogs and cancel hook
* fix: #471 add ref to order list table
* fix: #471 add field for cancel fix test
* fix: #471 rename vega-order-transaction-dialog, error handiling, open dialog on finalized order
* fix: #471 sendTx body mandatory
* fix: #471 use BusEventType.Order to check the typename
* fix: #471 revert using BusEventType.Order to check the typename
* Update libs/wallet/src/order-hooks/use-order-cancel.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* fix: #471 fix order-list refactoring and fixes
* fix: #471 generate orders added as a mock in order-list
* fix: #471 reset transaction after order updated
* fix: #471 remove unused import useEffect
* fix: #471 generate mock orders
* fix: #471 revert generate mock orders
* feat: #463 modify vega dialog to direct you to the block explorer transaction
* feat: #463 modify compile-environment.ts
* fix: #471 order list price set to display all decimals
* fix: #471 generate orders updates
* Update apps/trading/.env
* fix: #463 add test and remove explorer URL from trading/env.ts
* Update apps/trading/lib/config/env.ts
* fix: #463 update trading deal ticket
* fix: #463 fix test to check href
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* chore: [#471] update @vegaprotocol/vegawallet-service-api-client to 0.4.12
* fix: [#471] set up storybook in order-list lib and add tailwind
* fix: [#471] organize order list components
* chore: [471] pull theme switcher changes
* feat: [#471] add cancel order button
* feat: [#471] initial impl of use order cancel hook
* fix: [#471] fix format of the price in order list
* fix: #471 fix static assets issue when merging
* fix: #471 refactor order dialog to vega tx dialog
* fix: #471 move use cancel order hook in wallet lib
* fix: [#471] cancel order dialog and hook refactor
* fix: [#471] remove commented code from storybook preview and fix test
* fix: [#471] update order-list.tsx
* fix: [#471] fix update subscription - show order is cancelled
* fix: [#471] fix eslint error
* chore: [#471] refactoring and add tests for dialogs and cancel hook
* fix: #471 add ref to order list table
* fix: #471 add field for cancel fix test
* fix: #471 rename vega-order-transaction-dialog, error handiling, open dialog on finalized order
* fix: #471 sendTx body mandatory
* fix: #471 use BusEventType.Order to check the typename
* fix: #471 revert using BusEventType.Order to check the typename
* Update libs/wallet/src/order-hooks/use-order-cancel.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* fix: #471 fix order-list refactoring and fixes
* fix: #471 generate orders added as a mock in order-list
* fix: #471 reset transaction after order updated
* fix: #471 remove unused import useEffect
* fix: #471 generate mock orders
* fix: #471 revert generate mock orders
* fix: #471 order list price set to display all decimals
* fix: #471 generate orders updates
* fix: #471 remove unused import
* fix: #471 remove __typename from mock orders genOrder
* Update libs/wallet/src/order-hooks/order-event-query.ts
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* fix: #471 update order event sub and pull master changes
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* feat: 447 Refactored 'progress' intent to be 'prompt' as now white. Added yellow 'selected' intent
* feat: 447 Colour consolidation
* feat: 447 Colour consolidation extra renaming
* feat: 447 Fixing specified red colours
* feat: 447 Removed unused darker red
* feat: 447 Documenting additional colours in storybook
* feat: 447 Buttons updated (except 'accent', which will probably get removed when navs built)
* feat: 447 Text inputs updated
* feat:frontend-monorepo-447: Trading nav
* feat:frontend-monorepo-447: Updated toggle button colours
* feat:frontend-monorepo-447: Custom checkboxes
* feat:frontend-monorepo-447: Tweaks to radio buttons
* feat:frontend-monorepo-447: Input dates get dark color scheme in dark mode
* feat:frontend-monorepo-447: Dropdown updates
* feat:frontend-monorepo-447: Icon menu
* feat:frontend-monorepo-447: Focus visual styles moved to focus-visible for radios and toggle
* feat:frontend-monorepo-447: Tweak to focus styles for text input and textarea
* feat:frontend-monorepo-447: Labeled input
* feat:frontend-monorepo-447: Labeled input description red when in error
* feat:frontend-monorepo-447: Tooltip visual update
* feat:frontend-monorepo-447: Added disabled state to checkbox
* feat:frontend-monorepo-447: Custom select with radix
* feat:frontend-monorepo-447: Reverted back to native Select for a11y concerns
* feat:frontend-monorepo-447: Added visual cue for dropdown items when multiple can be selected
* feat:frontend-monorepo-447: Removed shadow from buttons in Explorer where it looked wrong
* feat:frontend-monorepo-447: Added box shadow classes into tailwind theme
* feat:frontend-monorepo-447: Colour primitives documentation updated
* feat:frontend-monorepo-447: Cleaning up box shadow use further
* feat:frontend-monorepo-447: Intents util updated
* feat:frontend-monorepo-447: Dialog component updated
* feat:frontend-monorepo-447: Callout component updated
* feat:frontend-monorepo-447: Adjusted apps to handle toolkit changes
* feat:frontend-monorepo-447: Moved tabs to ui-toolkit and styled
* feat:frontend-monorepo-447: Fixed ui-toolkit tests
* feat:frontend-monorepo-447: Token eth wallet made dark to support new buttons
* feat:frontend-monorepo-447: Ran prettier
* frontend-monorepo-447: Simplified button class functions and exported for use on other elements
* frontend-monorepo-447: Used newly exported button classes on Link elements in eth-wallet
* frontend-monorepo-447: Moved trading nav from ui-toolkit to trading app
* frontend-monorepo-447: Simplified intents and updated stories
* frontend-monorepo-447: Using classnames in requested spot
* frontend-monorepo-447: Removed unnecessary 'asChild' prop on dropdown triggers
* frontend-monorepo-447: Made use of the XPrimitive Radix naming convention
* frontend-monorepo-447: Simplified types in 'getButtonClasses'
* frontend-monorepo-447: Added 'asChild' to dropdown trigger to avoid nested buttons
* frontend-monorepo-447: Moved input label and description into Formgroup component. Refactored based on tweaked structure
* frontend-monorepo-447: Externally linked input label
* frontend-monorepo-447: Adding correct text colours to Intent.None backgrounds
* frontend-monorepo-447: Improved intent function name
* frontend-monorepo-447: Removed new navbar until implementation ticket is picked up
* frontend-monorepo-447: using testing-library/user-event for tab click unit tests
* frontend-monorepo-447: Removed unused button import
* frontend-monorepo-447: Little extra use of classnames in form-group.tsx
* feat: make navbar pink for light mode
* fix: problem with theme not switching when dependent in js on theme value
* fix: bg of row hover
* fix: dont use vega pink for sell red
* fix: type error in generate orders func
* fix: lint
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
* feat: format size and volume with positionDecimalPlaces
* fix: pass in calculated step so client side validation works
* fix: add requested state to order dialog, handle user rejected error
* feat: add test case for user rejecting tx
* feat: add test case for order list fractional sizes
* feat: add test case for fractional volume in positions table
* fix: deal ticket tests imports
* feat: add test case for trades fractional size
* fix: props for orderbook tests
* fix: add missing positionDecimalPlaces fields to mock functions
* fix: improve error handling of service error with type guard
* fix: move MarketList wait back
* fix: dont wait for MarketList query
* fix: move assertion to actual test body so other tests can run
* fix: ensure page rendered before checking url after redirect
* fix: grid layout
* fix: withdrawals test by giving explicit dates to mocked withdrawals so they are ordered correctly
* fix: remove supreflous intercepts and use one intercept for all gql queries
* fix: mock vega tx per test, beforeEach not working
* fix: wait for both queries
* fix: move MarketList wait back
* fix: dont wait for MarketList query
* fix: move assertion to actual test body so other tests can run
* fix: ensure page rendered before checking url after redirect
* feat: unhardcode contract addresses
* fix: linting and tests
* feat: switch contract usage in token app to use unhardcoded addresses
* chore: remove other usage of hard coded contract addresses
* feat: convert contracts to classes, update claim contract to fix circular dependency
* feat: add hard coded contract addresses to contracts page
* fix: misc tidy up
* chore: rename ethers big num conversion func
* fix: remove pending transactions modal
* chore: add single toBigNum function that can accept number string or EthersBignNumber
* chore: delete unused tranche helpers and decimals functions from smart contracts lib
* feat: add faucetable token class
* fix: reset tx state after early exit from approve tx
* feat: re add transaction modal using zustand store
* fix: loader colors for eth wallet
* fix: pass ethereum config to gurantee existence before tx execution
* add docker image for building explorer
* add arg
* env file changes
* add docker file to build env file
* add requirement for env file in explorer
* fix env file syntax
* containers functional
* default to testnet
* make env flag logic consistent in all places
* pre populate env file
* ensure working for all projects
* address PR comment
* generalising env for token
* invert config dependency from ui toolkit
* fix: merge issues
* docs: running containers documentation
* style: lint
* fix: env varibales not being added properly
* chore: fix merge issues
* chore: fix docker file to support new exectutors
* chore: set address on all contracts as a property
* feat: pull token from contract rather than relying on env var
* chore: fix typing
* chore: remove duplicated prop
* chore: don't use chainId
* style: lint
* style: lint
* Merge branch 'master' into feat/dockerize-frontends
* Merge remote-tracking branch 'origin/master' into feat/dockerize-frontends
* test: revert changes to explorer e2e file
* fix: creating client without base causing token to error
* test: fix tests erroring in before hook due to file not being found
* chore: remove node env from configurable flags
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
* fix: deposits tests, also convert to basic cypress
* add new home tests which test redirect to trading page and markets page
* chore: replace portfolio page feature with raw cypress
* chore: replace market page feature with raw cypress tests
* chore: replace home page tests with global.ts for wallet connections
* chore: add raw cypress withdrawals tests with mocks
* fix: complete withdrawals prompt and add assertion for it
* chore: remove unnecessary cypress envs now that we are mocking assets
* chore: ignore lint errors temporarily
* chore: add mock for deposit page query, add wait for mocked queries to resolve
* fix: order of waiting for withdraw page query
* fix: validate vega wallet connection
* chore: remove rest of page objects and convert trading page feature to regular cypress
* fix: assertion on transaction dialog after withdrawal
* chore: split withdraw and withdrawals pages into separate files
* chore: split trading tests into own files, connect wallet once for deal ticket
* feat: convert home page tests to raw cypress
* test: extract data via graphql in prep for date order checks
* test: linting changes
* test: overlay tests expanded
* test: linting follow up
* test: extra tests and increase timeouts
waiting on pr to improve scoping locators to the dialog and checking columns for content
* test: linting
* test: tweaks required to aid in initial wait
* test: linting
* test: removed a couple of imports not being used
* test: addressing typescript issues
* test: linting
* chore: type errors
* test: tidy up tests after typescript changes
* test: quick fix due to multiple links - using first
going forward it would be better to have ids for wrappers
Co-authored-by: Dexter <dexter.edwards93@gmail.com>
* [#151] market-depth code cleanup
* [#303] Make ask and bid relative volume bars relative to maximum bid or ask volume
* [#151] align cmulative vol bars to left
* [#151] replace orderbook zoom in zoom out buttons with dropdown
* [#151] fill gaps in orderbook data
* Order book mocks added
* [#151] mark mid price in orderbook
* [303] Show number in orderbook cumulative volume column
* [#808] show indicative uncrossing volume instead of volume if market is in auction mode
* Method for asserting order book style
* [#303] Add test id attributes to orderbook cells
* Cleanup steps after merge
* Order book test passing
* Change method name
* Revert "[#151] fill gaps in orderbook data"
This reverts commit 90ea4e4ab3.
* [#303] Orderbook rows render optimization
* test: update feature with @todo tests
Same tests can be found in Notion
* [#303] Orderbook scroll to mid price
* [#303] orderbook scroll to row pixel perfect alignment
* [#303] Bring back best offer horizontal lines
* [#303] Preserve center price level on row number change, adjust indicativePrice to resoluton
* feat(orderbook): add storybook
Refs: #303
* feat(orderbook): fix no rows handling
Refs: #303
* feat(orderbook): add orderbook stories for auction and continous market
Refs: #303
* feat(orderbook): add stories for empty orderbook
Refs: #303
* feat(orderbook): fix footer position when there is no data
Refs: #303
* feat(orderbook): seperate number of rows for buy and sell in storybook
Refs: #303
* feat(orderbook): keep mid price in middle until user will scroll
Refs: #303
* feat(orderbook): style scrollbar
* feat(orderbook): style scrollbar
* feat(orderbook): adjust gaps
* feat(orderbook): adjust gaps
* test: addition for autofilled order and mid price lines
* fix: lint
* feat(orderbook): make it posiible to write RTL tests
* feat(orderbook): fix price focus, add unit tests
* feat(orderbook): fix price scroll to mid proce, add unit tests
* feat(orderbook): improvements
- fix scrollbar colors in firefox
- bring back resolution dropdown chevron
- hide go to mid button when locked on mid price
- right align ask vol bar
- change grid gap to 5px
- add vertical lines between columns
- display "No data" if theis no orderbook data
- align header labels to right
* feat(orderbook): fix formatting
* feat(orderbook): add 5px gap
* feat(orderbook): improvements after code review
* feat(orderbook): display full height vertical lines
* fix: change in mid position
* feat(orderbook): fix number cannot be converted to BigInt because it is not integer
* feat(orderbook): fix TS2307 in trading-e2e caused by .module.scss import
Co-authored-by: Joe <joe@vega.xyz>
* fix: dont use localstorage for navigation, remove query params for tabs
* chore: lint
* fix: revert to using url rather than data test id
* chore: lint
* chore: remove arrow down ref from markets page object
* feat: unhardcode contract addresses
* fix: linting and tests
* feat: switch contract usage in token app to use unhardcoded addresses
* chore: remove other usage of hard coded contract addresses
* feat: convert contracts to classes, update claim contract to fix circular dependency
* feat: add hard coded contract addresses to contracts page
* fix: misc tidy up
* chore: rename ethers big num conversion func
* fix: remove pending transactions modal
* chore: add single toBigNum function that can accept number string or EthersBignNumber
* chore: delete unused tranche helpers and decimals functions from smart contracts lib
* feat: add faucetable token class
* fix: reset tx state after early exit from approve tx
* feat: re add transaction modal using zustand store
* fix: loader colors for eth wallet
* fix: pass ethereum config to gurantee existence before tx execution
* chore: lint smart contracts lib
* chore: fix web3container to use children and not render prop
* chore: lint
* fix: use background to mock ethereum wallet to avoid mocking globally for every test
* chore: move web3 mock to common steps and call from withdrawals feature tests
* feat: add base portfolio layout
* feat: add positions, order list and withdrawals to portfolio page
* feat: add account container to portfolio page plus wallet management improvments
* fix: remove duplication from portfolio page containers
* fix: format and lint
* fix: remove buggy wallet dialog from portfolio page
* fix: deposit e2e test navigation
* fix: temporarily go straight to withdrawal pages
* fix: formatting
* fix: add formatting
Co-authored-by: Joe <joe@vega.xyz>
* feat: [#456] select markets modal opening from market title
* feat: add a global zustand store for managing connect dialogs and landing dialog
* feat: add tests
* feat: [#456] make arrow configurable
* feat: [#456] make arrow configurable
* feat: [#456] trading tab active only on portfolio
* chore: update tranches
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* fix: [#445] shallow routing from index (#484)
* fix: [#445] shallow routing from index
* fix: [#445] use link to redirect to market - an attempt to fix reload
* fix: [#445] remove stretched link from last link - it makes all the other links unusable
* fix: [#445] fix lint on select market list - remove stretched link
* fix: [#456] put everything in landing folder to avoid conflicts
* fix: remove condition for cypress for auto connecting
* feat: [#456] add global store and fix href routing
* feat: [#456] add global store and fix href routing
* feat: [#456] add one more test
* feat: [#154] pull market data summary
* feat: [#154] move header above the trade grid child sections
* feat: [#154] flex oerflow and styling updates for market summary
* feat: [#154] fix styling
* fix: [154] fix cyp tests and styling
* fix: [#154] fix markets navigation cypress step
* fix: [#154] fix for navigate to markets link
* fix: failing tests from market change
* fix: [#154] set nav items based on market id and show last viewed market on landing
* fix: [#412] invalid decimal place on realised PnL field
* fix: [#154] remove redundant curly braces
* fix: [#154] show hyphen on volume if market data is undefined
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
Co-authored-by: dexturr <dexturr@users.noreply.github.com>
Co-authored-by: Joe <joe@vega.xyz>
* feat: add a global zustand store for managing connect dialogs and landing dialog
* feat: add tests
* fix: remove condition for cypress for auto connecting
* chore: fix assertion in tests for vega wallet text
* fix: add mock for landing dialog markets query
Co-authored-by: madalinaraicu <madalina@vegaprotocol.io>
* feat: add enviromnemt provider to the ui-toolkit
* chore: replace etherscan links
* chore: wrap trading app into environment provider
* chore: move env provider to react-helpers and wrap every app
* chore: remove more env variables from libs and replace them with the env hook
* fix: lint
* fix: update readme with correct formatting command
* fix: warnings for web3 hook
* fix: wrap warning in conditional, print message only when env keys are missing
* fix: incorrect condition on deposit manager fauceting param
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
* fix: cleanup token app ethereum config
* chore: add better error handling to the useEnvironment hook
* fix: lint
* fix: formatting
* fix: more lint
* fix: throw error if required env variables are missing
* fix: remove default eth chain id
* fix: add back etherscan testid to withdrawals links
* fix: imports
* fix: try using babel jest for smart contracts test transpilation
* fix: uniform ts syntax
* chore: set resolveJsonModule in base tsconfig
* fix: add missing data-ids for etherscan links
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
* feat: add positionDecimalPlaces prop to market query and regenerate types
* feat: add stepper to order amount input
* feat: convert fractions back to integers when submitting the order
* refactor: move order transformations into hooks
* fix: formatting
* fix: simplify toDecimal calculation
* fix: remove redundant function for size calculation
* fix: add new prop to e2e test mock generator
* feat: add tests for order validation
* fix: lint
* chore: add validation to the simple trading app order form
* fix: lint
* chore: improve assertions for deposits
* test: validation test passing
* test: withdrawal tests passing
* fix: test failures in CI
* fix: lint
* chore: add env variables
* fix: failing tests due to wallet service not running
* ci: pass automatic cnsent
* ci: init wallet in other directory
* ci: pass home string everywhere
* ci: config is already imported
* fix: failing deposit and nightly run
* ci: port over changes from pr run
* fix: failing network param tests
* fix: assertion
* fix: assertion one last time
Co-authored-by: Dexter <dexter.edwards93@gmail.com>
* [#305] add initial landing dialog on markets page and fix some typos
* [#305] market-list utils and generate schema
* [#305] initial styling of the landing dialog and add arrows
* [#305] routing to markets and add hover and market list tests
* [#305] fix z-index on dialog overlay
* [#305] default market shoulde be oldest market that is currently trading in continuous mode
* [#305] refactor market-list library
* [#305] add arrow unit tests
* Update libs/market-list/src/lib/components/landing/landing-dialog.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* Update libs/market-list/src/lib/components/landing/select-market-list.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* Update libs/market-list/src/lib/components/landing/select-market-list.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* test: fix failing tests from homepage change
* [#305] sort by id after sorting by date
* test: increase timeout for failing tests in CI
* [#305] destructuring all over the place and some code tweaks, arrows and percentage changes
* [#305] update sparkline to show colour
* [#305] fix order of market list
* [#305] stretchedLink class plus a-tag href for navigation - accessibility updates
* [#305] use href only and remove log
* [#305] use bignumber.js for price calculations
* [#305] change to bg-white/50 on dark mode overlay as asked from UX
* [#305] change to bg-white/50 on dark mode overlay as asked from UX
* [#305] toLocaleString fix
* [#305] toLocaleString fix
* [#305] add price-change-cell and use formatNumber
* [#305] add extra test for select market list
* Update apps/trading/specs/index.spec.tsx
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* [#305] use memo, sort by date and id lodash
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
Co-authored-by: Joe <joe@vega.xyz>
* delete token version of vega wallet serivce
* update use-user-vote to use new wallet service
* remove typo
* add further types for transaction submissions, add assets to withdraw page query
* update api client package to get generated types, adjust render logic of withdrawals page
* fix withdrawals list rendering
* update determine id function to not use nodejs buffer
* update service api client so it accepts new tx types
* remove stray logs and formatting
* make filtering erc20 assets the responsibility of the withdraw/deposit lib and not the app
* remove sha3 dep and use js-sha3 and ethers to determine ids
* use hook for fetching withdrawals form lib, add type policy to ensure withdrawal state is updated correctly
* fix: markets page feature
* add feature/scenarios for deposits
* add file for auction orders tests
* update feature file for deposits
* update feature tests for deposit
* add feature/scenarios for deposits
* add file for auction orders tests
* update feature file for deposits
* update feature tests for deposit
* add test for wallet not connected
* fix lint warning
* add mock ethereum provider to allow connecting ethereum wallet
* add basic test for required validation errors
* add aria for input errors for a11y and test targeting, expand submit form helper
* use mnemonic for private key generation, update tests to not submit and just assert validation message updates
* add chain id to cypress config
* update scenario
* remove feature file
* lint fix
* Update apps/trading-e2e/cypress.json
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* use mnemonic from github secret, update cypress.json env vars to match
* fix typo in test name and mnemonic env var
* update env variables
* update eth wallet mnemonic env
* Update libs/cypress/src/lib/eip1193-bridge.ts
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* remove unused reference to chainId
* update casing
* chainId reference from cypress.json
* Update apps/trading-e2e/cypress.json
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* Update apps/trading-e2e/src/support/step_definitions/deposits.step.ts
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* ignore a known failing step in the test due to wallet connected having approved status
* update testid
* update tests for deposits
* tidy up comments in custom cypress commands
* add comment about eager connect when running in cypress
* update deposits tests
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* Add additional checks before and after click
* Change back to use cy.contains
* Add assertion before click
* Change assert
* Remove force
* Add click
* Increase timeout
* move accounts and positions into own feature, add mock for accounts
* use length for expected number of columns
* combine trading feature tests into single trading-page.feature
* add orders scenario for trading page
* fix typo
* move related test cases for orders together
* add withdraw page
* add create page and withdraws lib with basic components
* add create withdrawal functionality, add withdrawal dialog
* re arrange pages so we have a pending page with a list of withdrawals and a withdraw page with the form
* handle withdrawal completion
* add withdraw dialog so withdraw is completed in one flow
* rename and arrange prop getter function to avoid use of any
* tidy up and make eth transaction and vega transaction hooks follow similar patterns
* make complete withdraw hook fetch approval, combine hooks for full flow
* delete unused file
* add accounts to query to get use max withdraw button
* use ag grid fro withdrawals list
* format amount in grid
* ensure party has id field for cache
* update to use t i18n function
* change complete status to better match values of WithdrawalStatus
* add asset lib file for type guard
* share queries for withdraws lib
* move web3 related hooks to the web3 lib and make web3 lib buildable
* add unit test for use-complete-withdraw
* add test for use-withdraw
* add e2e scenarios for withdrawals
* don render custom no withdrawals message and use ag grid prop
* make withdraw form take ethereum account as prop
* add test config, update withdraw form to handle min/max amounts, add unit test for withdraw form
* fix rendering 0 if not pending withdrawals
* use controlled component for select box
* tidy up async parts of tests, add test for withdraw-manager
* update withdraw dialog to use map for different tx states
* add fallback etherscan link, add test for withdraw-dialog.spec.tsx
* rename erc20 query in token app, change page structure to /withdraw and /withdrawals
* change linked vegawallet-service-api-client to newly published version
* ignore not implemented withdrawals e2e tests
* make vega tx pending and requested states the same, for now, until tx confirmation work is done
* Add some unit tests for determine-ids and remove0x
Neither are critical, but both are libs expected to be shared between
projects so some unit tests will hopefully ensure projects all have the
same expectations about how the functions act.
- Add 1 determine-ids test
- Add a few remove-0x tests
- Update determine-ids to use remove-0x
- Add a comment describing why i18n is what it is
* modify cache with client only field for tracking foreign chain progress
* move withdrawals-list to lib, add useWithdrawals hook
* add container component for withdrawals page
* add unit tests for withdrawals-table
* add some tests for use-withdrawals hook
* revert changes to generated files in other libs and apps
* update withdrawals scenarios
* resolve pr comments
* update page containers to use render prop rather than children
* delete unused files
* remove transaction dialog story
Co-authored-by: Ditmir-Vega <ditmir@vega.xyz>
Co-authored-by: Edd <edd@vega.xyz>
* change to setting envars rather than passing in via CLI
* update nx to latest patch version
* add env files for token-e2e, fix lint and ts errors
* move generate functions to mocs for trading e2e to avoid violating boundary rules
* add jsx compiler option for trading-e2e
* downgrade nextjs
* add testing-library to types declaration where required
* Explorer-e2e files changed to ts
* Files on trading app converted
* Fix type error and update Cypress
* Remove Jquery type
* Update Cypress version in package.json
* add fixture for markets query
* stub graphql requests
* re-add assertion for tx hash, stub command/sync requests
* refactor to get tests to run with trading page mocked queries
* add test wallet credentials
* split up markets page from trading page
* add portfolio page feature, add market page scenarios
* move hasOperationName helper to support/index
* fix home-page.feature
* fix missing feature step
* Minor changes to BDD steps
* Use in object syntax to get better type safety on hasOperationName helper function
* remove bypass placing orders env var and usage in tests
* use UI_Trading_Test wallet publick key in command/sync mock
* move public key to cypress env
* replace fixtures with generator functions
* colocate query generators with queries
* add custom commands, add index files
* fix dodgy merge, remove duplicate market page feature
* make tsconfig for cypress lib match
* update tsconfig for explorer e2e so commands using merge work
* revert trading step to js
Co-authored-by: Joe <joe@vega.xyz>
* scaffold dealticket package, remove trading views from react-helpers
* add deal ticket component, add intent utils, expand dialog and form group styles
* add splash component, show market not found message if market doesnt exist
* tidy up error handling
* add handleError method for vega tx hook
* add better testname for provider test, flesh out tests a bit more for deal ticket
* Add unit tests for useVegaTransaction and useOrderSubmit hooks
* add wrapper component for order dialog styles
* add vega styled loader to ui toolkit and use in order dialog
* add title prop to order dialog
* split limit and market tickets into own files
* add button radio component
* revert dialog styles
* move splash component to ui-toolkit, add story
* convert intent to enum
* Make button always type=button unless type prop is passed
* inline filter logic for tif selector
* add date-fns, add datetime to helpers
* add order types to wallet package, make price undefined if order type is market
* use enums in deal ticket logic
* tidy up order state by moving submit and transaction hooks out of deal ticket
* add comment for dialog styles
* remove decimal from price input
* add types package, delete old generated types from trading project
* rename types package to graphql
* update generate command to point to correct locations
* fix use order submit test
* BDD and navigation tests passing
* Remove commented steps
* Steps up to placing order
* Date picker and date-fns update
* Vega connector wallet tests
* Passing up to request sent, updated date picker
* Tests for sell orders and errors
* Update market feature
* Fix failing tests
* Update wallet login
* Readded tx hash assertion and remaining tests
* Add CI wallet import
* Update .github/workflows/cypress.yml
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
* Resolved PR comments
* Fix yaml error
* Attempt to fix failing tests in CI
* Run Cypress in Chrome
* Add reload if public key error displayed
* Fix wallet name
* Add force click and waits
* Increase timeout for deal ticket page
* Removed network list from yaml and using input error id
* Increase timeout to 8 seconds
* Re add deleted test id
Co-authored-by: Matthew Russell <mattrussell36@gmail.com>
Co-authored-by: Dexter Edwards <dexter.edwards93@gmail.com>
