From 17e2a0ba6715a2972228fc8a38c4a31cefdeff32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michalina=20Ciencia=C5=82a?= Date: Tue, 6 Jun 2023 15:43:18 +0200 Subject: [PATCH 1/2] Don't run postinstall script separately from `yarn install` Background: Previously we've been running postinstall script in a separate step from the `yarn install` command. We've been doing that as a workaround for a problem we had with the postinstall script in the `@threshold-network/solidity-contracts` package (the script in that package often randomly failed). Running `yarn upgrade` with `--ignore-scripts` flag prevented the execution of postinstall script in the main project and its depandencies. And running `yarn run postinstall` after did execute the postinstall script in the main project. The change: Recently we have refactored the `@threshold-network/solidity-contracts` project and got rid of the problematic script. We can go back to executing `yarn install` without the `--ignore-scripts` flag. We still need to execute `yarn run postinstall` in couple of places though - we need to do that after `yarn upgrade` commands, as `yarn upgrade` does not execute the postinstall scripts in the main project (and we have a script in the `threshold-network/token-dashboard` project that we need to execute). --- .github/workflows/dashboard-ci.yml | 7 ++----- .github/workflows/dashboard-mainnet.yml | 5 +---- .github/workflows/reusable-build-and-publish.yml | 6 +----- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/dashboard-ci.yml b/.github/workflows/dashboard-ci.yml index 83aac70a3..14d5de92b 100644 --- a/.github/workflows/dashboard-ci.yml +++ b/.github/workflows/dashboard-ci.yml @@ -42,10 +42,7 @@ jobs: run: git config --global url."https://".insteadOf git:// - name: Install dependencies - run: yarn install --ignore-scripts --frozen-lockfile - - - name: Run token-dashboard post-install script - run: yarn run postinstall + run: yarn install --frozen-lockfile - name: Check formatting run: yarn format @@ -80,7 +77,7 @@ jobs: @keep-network/tbtc-v2 \ @keep-network/tbtc-v2.ts \ @keep-network/ecdsa \ - @keep-network/random-beacon --ignore-scripts + @keep-network/random-beacon - name: Run postinstall script # `yarn upgrade` doesn't trigger the `postinstall` script. diff --git a/.github/workflows/dashboard-mainnet.yml b/.github/workflows/dashboard-mainnet.yml index e53f4189c..1bb3ddf9a 100644 --- a/.github/workflows/dashboard-mainnet.yml +++ b/.github/workflows/dashboard-mainnet.yml @@ -30,10 +30,7 @@ jobs: run: git config --global url."https://".insteadOf git:// - name: Install dependencies - run: yarn install --ignore-scripts --frozen-lockfile - - - name: Run token-dashboard post-install script - run: yarn run postinstall + run: yarn install --frozen-lockfile # FIXME: It's work in progress, the contracts are not yet published. # - name: Resolve latest mainnet contracts diff --git a/.github/workflows/reusable-build-and-publish.yml b/.github/workflows/reusable-build-and-publish.yml index d8279aa21..d6eb86c91 100644 --- a/.github/workflows/reusable-build-and-publish.yml +++ b/.github/workflows/reusable-build-and-publish.yml @@ -97,11 +97,7 @@ jobs: - name: Install dependencies shell: bash - run: yarn install --ignore-scripts --frozen-lockfile - - - name: Run token-dashboard post-install script - shell: bash - run: yarn run postinstall + run: yarn install --frozen-lockfile - name: Get upstream packages versions if: inputs.useUpstreamBuilds == true From e6c8ab3496a61bbb5e2ffb6736f42735b9de0212 Mon Sep 17 00:00:00 2001 From: Kamil Pyszkowski Date: Wed, 4 Oct 2023 14:03:52 +0200 Subject: [PATCH 2/2] Adjust font size for tBTC TVL value --- src/pages/tBTC/Explorer/index.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pages/tBTC/Explorer/index.tsx b/src/pages/tBTC/Explorer/index.tsx index 17e6edfdc..a1ef0157d 100644 --- a/src/pages/tBTC/Explorer/index.tsx +++ b/src/pages/tBTC/Explorer/index.tsx @@ -76,7 +76,14 @@ export const ExplorerPage: PageComponent = () => { -

{formatFiatCurrencyAmount(tvlInUSD.tBTC, "0,00.00")} USD

+

+ {formatFiatCurrencyAmount(tvlInUSD.tBTC, "0,00.00")} USD +