diff --git a/.github/workflows/ci-cd-trigger.yml b/.github/workflows/ci-cd-trigger.yml index cd8d5c102..0f8273647 100644 --- a/.github/workflows/ci-cd-trigger.yml +++ b/.github/workflows/ci-cd-trigger.yml @@ -5,6 +5,7 @@ on: branches: - release/* - develop + - main pull_request: types: - opened @@ -178,10 +179,33 @@ jobs: # with: # github-sha: ${{ github.event.pull_request.head.sha || github.sha }} - cypress: + check-e2e-needed: + runs-on: ubuntu-latest needs: build-sources + name: '(CI) check if e2e needed' + outputs: + run-tests: ${{ steps.check-test.outputs.e2e-needed }} + steps: + - name: Check branch + id: check-test + run: | + if [[ "${{ github.base_ref }}" == "develop" ]]; then + echo "e2e-needed=true" >> $GITHUB_OUTPUT + elif [[ "${{ github.base_ref }}" == "main" ]]; then + echo "e2e-needed=true" >> $GITHUB_OUTPUT + elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/"* ]]; then + echo "e2e-needed=true" >> $GITHUB_OUTPUT + else + echo "e2e-needed=false" >> $GITHUB_OUTPUT + fi + - name: Print result + run: | + echo "e2e-needed: ${{ steps.check-test.outputs.e2e-needed }}" + + cypress: + needs: [build-sources, check-e2e-needed] name: '(CI) cypress' - # if: ${{ needs.build-sources.outputs.projects-e2e != '[]' }} + if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }} uses: ./.github/workflows/cypress-run.yml secrets: inherit with: diff --git a/.github/workflows/cypress-run.yml b/.github/workflows/cypress-run.yml index 150d4b199..fe41f1c89 100644 --- a/.github/workflows/cypress-run.yml +++ b/.github/workflows/cypress-run.yml @@ -21,11 +21,11 @@ jobs: - name: Check branch id: step run: | - if [ ${{ github.base_ref }} == 'main' ]; then + if [[ "${{ github.base_ref }}" == "main" ]]; then echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT - elif [ ${{ github.base_ref }} == 'develop' ] && [ ${{ github.ref_name }} == 'main' ]; then + elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT - elif [ ${{ github.event_name }} == 'push' ] && [ ${{ contains(github.ref_name, 'release/mainnet') }} ]; then + elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/mainnet"* ]]; then echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT else echo "runner=self-hosted-runner" >> $GITHUB_OUTPUT @@ -85,6 +85,7 @@ jobs: - name: Run Vegacapsule network and Vega wallet id: setup-vega uses: ./frontend-monorepo/.github/actions/run-vegacapsule + timeout-minutes: 10 ###### ## Run some tests diff --git a/.github/workflows/publish-dist.yml b/.github/workflows/publish-dist.yml index f4ef0d7fc..622d25b71 100644 --- a/.github/workflows/publish-dist.yml +++ b/.github/workflows/publish-dist.yml @@ -63,7 +63,7 @@ jobs: echo IS_IPFS_RELEASE=true >> $GITHUB_ENV - name: Is S3 Release - if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' }} + if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' && github.ref_name != 'main'}} run: | echo IS_S3_RELEASE=true >> $GITHUB_ENV @@ -195,7 +195,7 @@ jobs: ENV_NAME=${{ env.ENV_NAME }} tags: | vegaprotocol/${{ matrix.app }}:${{ github.sha }} - vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true && main' || '' }} + vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }} - name: Publish dist as docker image (ghcr - retry) uses: docker/build-push-action@v3 @@ -222,7 +222,7 @@ jobs: ENV_NAME=${{ env.ENV_NAME }} tags: | vegaprotocol/${{ matrix.app }}:${{ github.sha }} - vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true && main' || '' }} + vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }} # bucket creation in github.com/vegaprotocol/terraform//frontend - name: Publish dist to s3 diff --git a/apps/explorer/src/app/routes/oracles/home/index.tsx b/apps/explorer/src/app/routes/oracles/home/index.tsx index d088a0a47..ebcb92344 100644 --- a/apps/explorer/src/app/routes/oracles/home/index.tsx +++ b/apps/explorer/src/app/routes/oracles/home/index.tsx @@ -8,7 +8,9 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location'; import filter from 'recursive-key-filter'; const Oracles = () => { - const { data, loading, error } = useExplorerOracleSpecsQuery(); + const { data, loading, error } = useExplorerOracleSpecsQuery({ + errorPolicy: 'ignore', + }); useDocumentTitle(['Oracles']); useScrollToLocation(); diff --git a/apps/governance/.env b/apps/governance/.env index a616f4faa..4ff5c56d5 100644 --- a/apps/governance/.env +++ b/apps/governance/.env @@ -8,6 +8,7 @@ NX_FAIRGROUND=false NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}' NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions NX_VEGA_WALLET_URL=http://localhost:1789 +NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json diff --git a/apps/governance/.env.mainnet b/apps/governance/.env.mainnet index 55ee0376a..ec7d8c54a 100644 --- a/apps/governance/.env.mainnet +++ b/apps/governance/.env.mainnet @@ -17,7 +17,7 @@ NX_VEGA_REST_URL=https://api.vega.community/api/v2/ NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json - +NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 NX_TENDERMINT_URL=https://be.vega.community NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket diff --git a/apps/governance/.env.stagnet1 b/apps/governance/.env.stagnet1 index 589886a1d..5667fa764 100644 --- a/apps/governance/.env.stagnet1 +++ b/apps/governance/.env.stagnet1 @@ -10,6 +10,7 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json +NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground diff --git a/apps/governance/.env.testnet b/apps/governance/.env.testnet index 86ff8e022..9e18ad610 100644 --- a/apps/governance/.env.testnet +++ b/apps/governance/.env.testnet @@ -15,6 +15,7 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json +NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground diff --git a/apps/trading/.env.mainnet b/apps/trading/.env.mainnet index 80e287cfc..177747d36 100644 --- a/apps/trading/.env.mainnet +++ b/apps/trading/.env.mainnet @@ -16,6 +16,7 @@ NX_VEGA_CONSOLE_URL=https://console.vega.xyz NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json +NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 # Cosmic elevator flags NX_SUCCESSOR_MARKETS=true diff --git a/apps/trading/.env.stagnet1 b/apps/trading/.env.stagnet1 index 2e26587b0..9da03d5e5 100644 --- a/apps/trading/.env.stagnet1 +++ b/apps/trading/.env.stagnet1 @@ -16,7 +16,7 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json - +NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 # Cosmic elevator flags NX_SUCCESSOR_MARKETS=true diff --git a/apps/trading/.env.testnet b/apps/trading/.env.testnet index 53a7c10b2..853689764 100644 --- a/apps/trading/.env.testnet +++ b/apps/trading/.env.testnet @@ -17,6 +17,7 @@ NX_VEGA_CONSOLE_URL=https://console.fairground.wtf NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json +NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72 # Cosmic elevator flags NX_SUCCESSOR_MARKETS=true diff --git a/apps/trading/client-pages/market/trade-grid.tsx b/apps/trading/client-pages/market/trade-grid.tsx index 6419e95ca..a25934d4d 100644 --- a/apps/trading/client-pages/market/trade-grid.tsx +++ b/apps/trading/client-pages/market/trade-grid.tsx @@ -136,7 +136,7 @@ const MainGrid = memo( ) : null} - + { +export const FillsContainer = () => { const onMarketClick = useMarketClickHandler(true); const { pubKey } = useVegaWallet(); @@ -31,7 +31,6 @@ export const FillsContainer = ({ marketId }: { marketId?: string }) => { return ( diff --git a/libs/fills/src/lib/fills-manager.tsx b/libs/fills/src/lib/fills-manager.tsx index 33a610449..85f2ffcae 100644 --- a/libs/fills/src/lib/fills-manager.tsx +++ b/libs/fills/src/lib/fills-manager.tsx @@ -9,14 +9,12 @@ import { fillsWithMarketProvider } from './fills-data-provider'; interface FillsManagerProps { partyId: string; - marketId?: string; onMarketClick?: (marketId: string, metaKey?: boolean) => void; gridProps: ReturnType; } export const FillsManager = ({ partyId, - marketId, onMarketClick, gridProps, }: FillsManagerProps) => { @@ -24,9 +22,6 @@ export const FillsManager = ({ const filter: Schema.TradesFilter | Schema.TradesSubscriptionFilter = { partyIds: [partyId], }; - if (marketId) { - filter.marketIds = [marketId]; - } const { data, error } = useDataProvider({ dataProvider: fillsWithMarketProvider, update: ({ data }) => { diff --git a/libs/wallet/src/connect-dialog/injected-connector-form.tsx b/libs/wallet/src/connect-dialog/injected-connector-form.tsx index 1fce47bd3..88ca00a39 100644 --- a/libs/wallet/src/connect-dialog/injected-connector-form.tsx +++ b/libs/wallet/src/connect-dialog/injected-connector-form.tsx @@ -131,7 +131,12 @@ const Error = ({ ); if (error) { - if (error.message === InjectedConnectorErrors.INVALID_CHAIN.message) { + if (error.message === InjectedConnectorErrors.USER_REJECTED.message) { + title = t('User rejected'); + text = t('The user rejected the wallet connection'); + } else if ( + error.message === InjectedConnectorErrors.INVALID_CHAIN.message + ) { title = t('Wrong network'); text = t( 'To complete your wallet connection, set your wallet network in your app to "%s".', diff --git a/libs/wallet/src/connectors/injected-connector.ts b/libs/wallet/src/connectors/injected-connector.ts index 8ebc66b3e..dbe9f106e 100644 --- a/libs/wallet/src/connectors/injected-connector.ts +++ b/libs/wallet/src/connectors/injected-connector.ts @@ -42,6 +42,7 @@ declare global { } export const InjectedConnectorErrors = { + USER_REJECTED: new Error('Connection denied'), VEGA_UNDEFINED: new Error('window.vega not found'), INVALID_CHAIN: new Error('Invalid chain'), }; diff --git a/package.json b/package.json index fe567c110..1425c72ee 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "jsondiffpatch": "^0.4.1", "lodash": "^4.17.21", "next": "13.3.0", - "pennant": "1.12.0", + "pennant": "1.13.2", "react": "18.2.0", "react-copy-to-clipboard": "^5.0.4", "react-dom": "18.2.0", diff --git a/yarn.lock b/yarn.lock index 22c5ea1a5..cd25b507e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20500,10 +20500,10 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== -pennant@1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.12.0.tgz#e12707d5f1aac554d81bad060637e608335e0b50" - integrity sha512-xosg5erRf+Ke9iORdqyv+SOGcD3uJX1dgf990q1DvHuzz36w2txCZsfnvcXhRO++HYVKS9sU/YLPRLJgolFGtA== +pennant@1.13.2: + version "1.13.2" + resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.13.2.tgz#8ae0cf23ecee35a7e8baddaa9477e94006581e3b" + integrity sha512-gdzTUfuvR3Jse247+++mUdJJcDrExtoxljZ6TjVjnvOD7Y0Cx7yiA47VKzztcw5JmoEHbMoDeX3ySznAjIpi7Q== dependencies: "@babel/runtime" "^7.13.10" "@d3fc/d3fc-technical-indicator" "^8.0.1"