From 89bcb5649bf7290af44f88b34b1091b9fe0dc0c6 Mon Sep 17 00:00:00 2001 From: farbanas Date: Tue, 6 Dec 2022 17:23:08 +0100 Subject: [PATCH 1/8] changed ubuntu-latest on GH actions to ubuntu-20.04 --- .github/workflows/audit.yml | 4 ++-- .github/workflows/build_matrix_includes.json | 2 +- .github/workflows/contracts-build.yml | 2 +- .github/workflows/contracts.yml | 4 ++-- .github/workflows/network-explorer-api.yml | 2 +- .github/workflows/nightly_build.yml | 8 ++++---- .github/workflows/nightly_build_matrix_includes.json | 6 +++--- .github/workflows/nightly_build_release.yml | 10 +++++----- .github/workflows/nightly_build_release2.yml | 10 +++++----- .github/workflows/nym-cli-publish.yml | 2 +- .github/workflows/nym-connect-publish-ubuntu.yml | 2 +- .github/workflows/nym-release-publish.yml | 2 +- .github/workflows/nym-wallet-publish-ubuntu.yml | 2 +- .github/workflows/nym-wallet-release.yml | 2 +- .github/workflows/nym_wallet.yml | 2 +- .github/workflows/support-files/nightly/index.js | 2 +- .github/workflows/wasm_client_build.yml | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index f43a1feb77..00b13da72b 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -5,7 +5,7 @@ on: - cron: '5 9 * * *' jobs: cargo-deny: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout repository code uses: actions/checkout@v2 @@ -26,7 +26,7 @@ jobs: path: .github/workflows/support-files/notifications/deny.message notification: needs: cargo-deny - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Check out repository code uses: actions/checkout@v2 diff --git a/.github/workflows/build_matrix_includes.json b/.github/workflows/build_matrix_includes.json index a75ca76530..8d8f8297bc 100644 --- a/.github/workflows/build_matrix_includes.json +++ b/.github/workflows/build_matrix_includes.json @@ -1,6 +1,6 @@ [ { - "os":"ubuntu-latest", + "os":"ubuntu-20.04", "rust":"stable", "runOnEvent":"always" }, diff --git a/.github/workflows/contracts-build.yml b/.github/workflows/contracts-build.yml index 3921bd3a6d..9ecc6b49d9 100644 --- a/.github/workflows/contracts-build.yml +++ b/.github/workflows/contracts-build.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/contracts.yml b/.github/workflows/contracts.yml index 2c1eaf40b2..6d51356a80 100644 --- a/.github/workflows/contracts.yml +++ b/.github/workflows/contracts.yml @@ -10,7 +10,7 @@ on: jobs: matrix_prep: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: @@ -24,7 +24,7 @@ jobs: contracts: # since it's going to be compiled into wasm, there's absolutely # no point in running CI on different OS-es - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 continue-on-error: ${{ matrix.rust == 'nightly' }} needs: matrix_prep strategy: diff --git a/.github/workflows/network-explorer-api.yml b/.github/workflows/network-explorer-api.yml index 2ad184be72..5c60038347 100644 --- a/.github/workflows/network-explorer-api.yml +++ b/.github/workflows/network-explorer-api.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-latest] + platform: [ubuntu-20.04] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 8475b83b8b..d103b66278 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -5,7 +5,7 @@ on: - cron: '14 1 * * *' jobs: matrix_prep: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: @@ -25,7 +25,7 @@ jobs: steps: - name: Install Dependencies (Linux) run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' - name: Check out repository code uses: actions/checkout@v2 @@ -96,7 +96,7 @@ jobs: - name: Reclaim some disk space uses: actions-rs/cargo@v1 - if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }} with: command: clean @@ -160,7 +160,7 @@ jobs: notification: needs: build - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Collect jobs status uses: technote-space/workflow-conclusion-action@v2 diff --git a/.github/workflows/nightly_build_matrix_includes.json b/.github/workflows/nightly_build_matrix_includes.json index a979c90a62..172944df28 100644 --- a/.github/workflows/nightly_build_matrix_includes.json +++ b/.github/workflows/nightly_build_matrix_includes.json @@ -1,6 +1,6 @@ [ { - "os":"ubuntu-latest", + "os":"ubuntu-20.04", "rust":"stable", "runOnEvent":"schedule" }, @@ -17,7 +17,7 @@ }, { - "os":"ubuntu-latest", + "os":"ubuntu-20.04", "rust":"beta", "runOnEvent":"schedule" }, @@ -33,7 +33,7 @@ }, { - "os":"ubuntu-latest", + "os":"ubuntu-20.04", "rust":"nightly", "runOnEvent":"schedule" }, diff --git a/.github/workflows/nightly_build_release.yml b/.github/workflows/nightly_build_release.yml index 4474b399b6..7e99137607 100644 --- a/.github/workflows/nightly_build_release.yml +++ b/.github/workflows/nightly_build_release.yml @@ -5,7 +5,7 @@ on: - cron: '14 2 * * *' jobs: matrix_prep: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: @@ -17,7 +17,7 @@ jobs: inputFile: '.github/workflows/nightly_build_matrix_includes.json' filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]' get_release: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: matrix_prep outputs: output1: ${{ steps.step2.outputs.latest_release }} @@ -38,7 +38,7 @@ jobs: steps: - name: Install Dependencies (Linux) run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' - name: Check out latest release branch uses: actions/checkout@v3 @@ -111,7 +111,7 @@ jobs: - name: Reclaim some disk space uses: actions-rs/cargo@v1 - if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }} with: command: clean @@ -175,7 +175,7 @@ jobs: notification: needs: [build,get_release] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Collect jobs status uses: technote-space/workflow-conclusion-action@v2 diff --git a/.github/workflows/nightly_build_release2.yml b/.github/workflows/nightly_build_release2.yml index 71f89948c9..4da0f2ea62 100644 --- a/.github/workflows/nightly_build_release2.yml +++ b/.github/workflows/nightly_build_release2.yml @@ -5,7 +5,7 @@ on: - cron: '24 2 * * *' jobs: matrix_prep: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: @@ -17,7 +17,7 @@ jobs: inputFile: '.github/workflows/nightly_build_matrix_includes.json' filter: '[?runOnEvent==`${{ github.event_name }}` || runOnEvent==`always`]' get_release: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 needs: matrix_prep outputs: output1: ${{ steps.step2.outputs.latest_release }} @@ -38,7 +38,7 @@ jobs: steps: - name: Install Dependencies (Linux) run: sudo apt-get update && sudo apt-get install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libudev-dev squashfs-tools - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-20.04' - name: Check out latest release branch uses: actions/checkout@v3 @@ -111,7 +111,7 @@ jobs: - name: Reclaim some disk space uses: actions-rs/cargo@v1 - if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'windows-latest' || matrix.os == 'ubuntu-20.04' }} with: command: clean @@ -175,7 +175,7 @@ jobs: notification: needs: [build,get_release] - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Collect jobs status uses: technote-space/workflow-conclusion-action@v2 diff --git a/.github/workflows/nym-cli-publish.yml b/.github/workflows/nym-cli-publish.yml index 065e9f1658..5fd532c68b 100644 --- a/.github/workflows/nym-cli-publish.yml +++ b/.github/workflows/nym-cli-publish.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-latest, windows-latest, macos-latest] + platform: [ubuntu-20.04, windows-latest, macos-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/nym-connect-publish-ubuntu.yml b/.github/workflows/nym-connect-publish-ubuntu.yml index 52c6ed9c5e..a4eb77cae1 100644 --- a/.github/workflows/nym-connect-publish-ubuntu.yml +++ b/.github/workflows/nym-connect-publish-ubuntu.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-latest] + platform: [ubuntu-20.04] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/nym-release-publish.yml b/.github/workflows/nym-release-publish.yml index 700f1d697f..979781652f 100644 --- a/.github/workflows/nym-release-publish.yml +++ b/.github/workflows/nym-release-publish.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-latest] + platform: [ubuntu-20.04] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/nym-wallet-publish-ubuntu.yml b/.github/workflows/nym-wallet-publish-ubuntu.yml index 46ed4be076..04ff746851 100644 --- a/.github/workflows/nym-wallet-publish-ubuntu.yml +++ b/.github/workflows/nym-wallet-publish-ubuntu.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-latest] + platform: [ubuntu-20.04] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/nym-wallet-release.yml b/.github/workflows/nym-wallet-release.yml index 4e157903e6..34883144f3 100644 --- a/.github/workflows/nym-wallet-release.yml +++ b/.github/workflows/nym-wallet-release.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-latest] + platform: [ubuntu-20.04] runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/nym_wallet.yml b/.github/workflows/nym_wallet.yml index bbc981d0f4..49b2381ed0 100644 --- a/.github/workflows/nym_wallet.yml +++ b/.github/workflows/nym_wallet.yml @@ -12,7 +12,7 @@ defaults: jobs: test: name: wallet tests - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/support-files/nightly/index.js b/.github/workflows/support-files/nightly/index.js index f913539235..3bf2516092 100644 --- a/.github/workflows/support-files/nightly/index.js +++ b/.github/workflows/support-files/nightly/index.js @@ -85,7 +85,7 @@ async function getMessageBody(context) { ... ], check_run_url: 'https://api.github.com/repos/nymtech/nym/check-runs/5182940024', - labels: [ 'ubuntu-latest' ], + labels: [ 'ubuntu-20.04' ], runner_id: 1, runner_name: 'Hosted Agent', runner_group_id: 2, diff --git a/.github/workflows/wasm_client_build.yml b/.github/workflows/wasm_client_build.yml index 2761aabcd2..e1da3b04b0 100644 --- a/.github/workflows/wasm_client_build.yml +++ b/.github/workflows/wasm_client_build.yml @@ -7,7 +7,7 @@ on: jobs: wasm: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 From 4d08d62fc25d919a3654ee8eeb83fb0ad24c6627 Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 21 Dec 2022 11:54:41 +0100 Subject: [PATCH 2/8] wip adding gt version --- explorer/src/components/Gateways.ts | 17 ++++++++++------- explorer/src/pages/Gateways/index.tsx | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/explorer/src/components/Gateways.ts b/explorer/src/components/Gateways.ts index e75c9aeb05..6e6d08b1f9 100644 --- a/explorer/src/components/Gateways.ts +++ b/explorer/src/components/Gateways.ts @@ -7,6 +7,7 @@ export type GatewayRowType = { bond: number; host: string; location: string; + version: string; }; export type GatewayEnrichedRowType = GatewayRowType & { @@ -20,13 +21,14 @@ export function gatewayToGridRow(arrayOfGateways: GatewayResponse): GatewayRowTy return !arrayOfGateways ? [] : arrayOfGateways.map((gw) => ({ - id: gw.owner, - owner: gw.owner, - identityKey: gw.gateway.identity_key || '', - location: gw?.gateway?.location || '', - bond: gw.pledge_amount.amount || 0, - host: gw.gateway.host || '', - })); + id: gw.owner, + owner: gw.owner, + identityKey: gw.gateway.identity_key || '', + location: gw?.gateway?.location || '', + bond: gw.pledge_amount.amount || 0, + host: gw.gateway.host || '', + version: gw.gateway.version || '', + })); } export function gatewayEnrichedToGridRow( @@ -40,6 +42,7 @@ export function gatewayEnrichedToGridRow( location: gateway?.gateway?.location || '', bond: gateway.pledge_amount.amount || 0, host: gateway.gateway.host || '', + version: gateway.gateway.version || '', clientsPort: gateway.gateway.clients_port || 0, mixPort: gateway.gateway.mix_port || 0, routingScore: `${report.most_recent}%`, diff --git a/explorer/src/pages/Gateways/index.tsx b/explorer/src/pages/Gateways/index.tsx index 2430e4f9a5..60fdf28bd5 100644 --- a/explorer/src/pages/Gateways/index.tsx +++ b/explorer/src/pages/Gateways/index.tsx @@ -27,6 +27,7 @@ export const PageGateways: React.FC = () => { React.useEffect(() => { if (searchTerm === '' && gateways?.data) { + console.log('gateways?.data', gateways?.data); setFilteredGateways(gateways?.data); } else { const filtered = gateways?.data?.filter((g) => { @@ -142,6 +143,25 @@ export const PageGateways: React.FC = () => { ), }, + , + { + field: 'version', + headerName: 'Version', + renderHeader: () => , + width: 150, + headerAlign: 'left', + headerClassName: 'MuiDataGrid-header-override', + renderCell: (params: GridRenderCellParams) => ( + + {params.value} + + ), + }, ]; const handlePageSize = (event: SelectChangeEvent) => { From a14ae298ae7eb05216ab409b2fdb8c779363d617 Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 21 Dec 2022 13:59:23 +0100 Subject: [PATCH 3/8] sdding version number on the gateways list and details --- explorer/src/pages/GatewayDetail/index.tsx | 6 ++++++ explorer/src/pages/Gateways/index.tsx | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/explorer/src/pages/GatewayDetail/index.tsx b/explorer/src/pages/GatewayDetail/index.tsx index 5fb7dd9c9f..3372ded2a7 100644 --- a/explorer/src/pages/GatewayDetail/index.tsx +++ b/explorer/src/pages/GatewayDetail/index.tsx @@ -58,6 +58,12 @@ const columns: ColumnsType[] = [ headerAlign: 'left', flex: 1, }, + { + field: 'version', + title: 'Version', + headerAlign: 'left', + flex: 1, + }, ]; /** diff --git a/explorer/src/pages/Gateways/index.tsx b/explorer/src/pages/Gateways/index.tsx index 60fdf28bd5..2edfe62527 100644 --- a/explorer/src/pages/Gateways/index.tsx +++ b/explorer/src/pages/Gateways/index.tsx @@ -129,7 +129,7 @@ export const PageGateways: React.FC = () => { field: 'owner', headerName: 'Owner', renderHeader: () => , - width: 380, + width: 180, headerAlign: 'left', headerClassName: 'MuiDataGrid-header-override', renderCell: (params: GridRenderCellParams) => ( @@ -143,7 +143,6 @@ export const PageGateways: React.FC = () => { ), }, - , { field: 'version', headerName: 'Version', From 246decac4a96cae86cdc9955e02eedb5533178fc Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 21 Dec 2022 14:01:53 +0100 Subject: [PATCH 4/8] remove console log --- explorer/src/pages/Gateways/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/explorer/src/pages/Gateways/index.tsx b/explorer/src/pages/Gateways/index.tsx index 2edfe62527..8e01fad54c 100644 --- a/explorer/src/pages/Gateways/index.tsx +++ b/explorer/src/pages/Gateways/index.tsx @@ -27,7 +27,6 @@ export const PageGateways: React.FC = () => { React.useEffect(() => { if (searchTerm === '' && gateways?.data) { - console.log('gateways?.data', gateways?.data); setFilteredGateways(gateways?.data); } else { const filtered = gateways?.data?.filter((g) => { From 06eff652dd25228d86a5c228f833174f69cd7197 Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 21 Dec 2022 11:54:41 +0100 Subject: [PATCH 5/8] wip adding gt version --- explorer/src/components/Gateways.ts | 17 ++++++++++------- explorer/src/pages/Gateways/index.tsx | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/explorer/src/components/Gateways.ts b/explorer/src/components/Gateways.ts index e75c9aeb05..6e6d08b1f9 100644 --- a/explorer/src/components/Gateways.ts +++ b/explorer/src/components/Gateways.ts @@ -7,6 +7,7 @@ export type GatewayRowType = { bond: number; host: string; location: string; + version: string; }; export type GatewayEnrichedRowType = GatewayRowType & { @@ -20,13 +21,14 @@ export function gatewayToGridRow(arrayOfGateways: GatewayResponse): GatewayRowTy return !arrayOfGateways ? [] : arrayOfGateways.map((gw) => ({ - id: gw.owner, - owner: gw.owner, - identityKey: gw.gateway.identity_key || '', - location: gw?.gateway?.location || '', - bond: gw.pledge_amount.amount || 0, - host: gw.gateway.host || '', - })); + id: gw.owner, + owner: gw.owner, + identityKey: gw.gateway.identity_key || '', + location: gw?.gateway?.location || '', + bond: gw.pledge_amount.amount || 0, + host: gw.gateway.host || '', + version: gw.gateway.version || '', + })); } export function gatewayEnrichedToGridRow( @@ -40,6 +42,7 @@ export function gatewayEnrichedToGridRow( location: gateway?.gateway?.location || '', bond: gateway.pledge_amount.amount || 0, host: gateway.gateway.host || '', + version: gateway.gateway.version || '', clientsPort: gateway.gateway.clients_port || 0, mixPort: gateway.gateway.mix_port || 0, routingScore: `${report.most_recent}%`, diff --git a/explorer/src/pages/Gateways/index.tsx b/explorer/src/pages/Gateways/index.tsx index 2430e4f9a5..60fdf28bd5 100644 --- a/explorer/src/pages/Gateways/index.tsx +++ b/explorer/src/pages/Gateways/index.tsx @@ -27,6 +27,7 @@ export const PageGateways: React.FC = () => { React.useEffect(() => { if (searchTerm === '' && gateways?.data) { + console.log('gateways?.data', gateways?.data); setFilteredGateways(gateways?.data); } else { const filtered = gateways?.data?.filter((g) => { @@ -142,6 +143,25 @@ export const PageGateways: React.FC = () => { ), }, + , + { + field: 'version', + headerName: 'Version', + renderHeader: () => , + width: 150, + headerAlign: 'left', + headerClassName: 'MuiDataGrid-header-override', + renderCell: (params: GridRenderCellParams) => ( + + {params.value} + + ), + }, ]; const handlePageSize = (event: SelectChangeEvent) => { From 57d3d6fd0fe9d5f94da89df50a16007e49fb93f7 Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 21 Dec 2022 13:59:23 +0100 Subject: [PATCH 6/8] sdding version number on the gateways list and details --- explorer/src/pages/GatewayDetail/index.tsx | 6 ++++++ explorer/src/pages/Gateways/index.tsx | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/explorer/src/pages/GatewayDetail/index.tsx b/explorer/src/pages/GatewayDetail/index.tsx index 5fb7dd9c9f..3372ded2a7 100644 --- a/explorer/src/pages/GatewayDetail/index.tsx +++ b/explorer/src/pages/GatewayDetail/index.tsx @@ -58,6 +58,12 @@ const columns: ColumnsType[] = [ headerAlign: 'left', flex: 1, }, + { + field: 'version', + title: 'Version', + headerAlign: 'left', + flex: 1, + }, ]; /** diff --git a/explorer/src/pages/Gateways/index.tsx b/explorer/src/pages/Gateways/index.tsx index 60fdf28bd5..2edfe62527 100644 --- a/explorer/src/pages/Gateways/index.tsx +++ b/explorer/src/pages/Gateways/index.tsx @@ -129,7 +129,7 @@ export const PageGateways: React.FC = () => { field: 'owner', headerName: 'Owner', renderHeader: () => , - width: 380, + width: 180, headerAlign: 'left', headerClassName: 'MuiDataGrid-header-override', renderCell: (params: GridRenderCellParams) => ( @@ -143,7 +143,6 @@ export const PageGateways: React.FC = () => { ), }, - , { field: 'version', headerName: 'Version', From bd20fd0b1f239323013574024796478e61a0671b Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 21 Dec 2022 14:01:53 +0100 Subject: [PATCH 7/8] remove console log --- explorer/src/pages/Gateways/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/explorer/src/pages/Gateways/index.tsx b/explorer/src/pages/Gateways/index.tsx index 2edfe62527..8e01fad54c 100644 --- a/explorer/src/pages/Gateways/index.tsx +++ b/explorer/src/pages/Gateways/index.tsx @@ -27,7 +27,6 @@ export const PageGateways: React.FC = () => { React.useEffect(() => { if (searchTerm === '' && gateways?.data) { - console.log('gateways?.data', gateways?.data); setFilteredGateways(gateways?.data); } else { const filtered = gateways?.data?.filter((g) => { From e0f2fa670578ecdca00637002b12f45165baaa90 Mon Sep 17 00:00:00 2001 From: Gala Date: Wed, 21 Dec 2022 14:45:14 +0100 Subject: [PATCH 8/8] fix indentation --- explorer/src/components/Gateways.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/explorer/src/components/Gateways.ts b/explorer/src/components/Gateways.ts index 6e6d08b1f9..aa055a71d0 100644 --- a/explorer/src/components/Gateways.ts +++ b/explorer/src/components/Gateways.ts @@ -21,14 +21,14 @@ export function gatewayToGridRow(arrayOfGateways: GatewayResponse): GatewayRowTy return !arrayOfGateways ? [] : arrayOfGateways.map((gw) => ({ - id: gw.owner, - owner: gw.owner, - identityKey: gw.gateway.identity_key || '', - location: gw?.gateway?.location || '', - bond: gw.pledge_amount.amount || 0, - host: gw.gateway.host || '', - version: gw.gateway.version || '', - })); + id: gw.owner, + owner: gw.owner, + identityKey: gw.gateway.identity_key || '', + location: gw?.gateway?.location || '', + bond: gw.pledge_amount.amount || 0, + host: gw.gateway.host || '', + version: gw.gateway.version || '', + })); } export function gatewayEnrichedToGridRow(