diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index 1ffaac996..81d9ad42e 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -4,15 +4,12 @@ name: "Bump Version on sepolia" on: - push: - branches: - - mainnet + workflow_dispatch: jobs: bump-version: if: | - !startsWith(github.event.head_commit.message, 'ci: version bump to ') && - !endsWith(github.event.head_commit.message, ' [bot]') + !startsWith(github.event.head_commit.message, 'ci: version bump to ') name: "Bump version on production" permissions: contents: write diff --git a/.github/workflows/merge_prod_back_to_dev.yml b/.github/workflows/merge_prod_back_to_dev.yml index b50312c84..1980afbb5 100644 --- a/.github/workflows/merge_prod_back_to_dev.yml +++ b/.github/workflows/merge_prod_back_to_dev.yml @@ -5,13 +5,12 @@ name: "Merge Prod Back to Dev" on: push: branches: - - sepolia + - mainnet jobs: merge-back: if: | - startsWith(github.event.head_commit.message, 'ci: version bump to ') && - endsWith(github.event.head_commit.message, ' [bot]') + !endsWith(github.event.head_commit.message, ' [bot]') name: "Merge prod back to dev" permissions: contents: write @@ -40,3 +39,8 @@ jobs: title: "Auto-merge prod back to dev [bot]" labels: "bot/merge-prod-back-to-dev, automerge, automerge-merge" body: "" + - name: Trigger Version Bump Wrokflow + uses: peter-evans/repository-dispatch@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + event-type: bump-version diff --git a/package.json b/package.json index 45e2589de..3a8699955 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scroll.io", - "version": "5.0.31", + "version": "5.0.32", "private": false, "license": "MIT", "scripts": { diff --git a/src/pages/new-bridge/TxHistoryDialog/index.tsx b/src/pages/new-bridge/TxHistoryDialog/index.tsx index 89cf690b8..7ba9e72ad 100644 --- a/src/pages/new-bridge/TxHistoryDialog/index.tsx +++ b/src/pages/new-bridge/TxHistoryDialog/index.tsx @@ -11,7 +11,7 @@ const useStyles = makeStyles()(theme => ({ paper: { boxShadow: "unset", width: "100%", - maxWidth: "75rem", + maxWidth: "78rem", [theme.breakpoints.down("sm")]: { maxWidth: "unset", }, diff --git a/src/pages/new-bridge/components/TxTable/index.tsx b/src/pages/new-bridge/components/TxTable/index.tsx index d400411df..45446163e 100644 --- a/src/pages/new-bridge/components/TxTable/index.tsx +++ b/src/pages/new-bridge/components/TxTable/index.tsx @@ -42,9 +42,7 @@ const useStyles = makeStyles()(theme => { }, tableMinHeight: { minHeight: "20rem", - [theme.breakpoints.down("sm")]: { - overflowX: "auto", - }, + overflowX: "auto", }, tableTitle: { marginTop: "2.8rem",