From 8365657c38107dfd6d345d2b8a7e80d36a208199 Mon Sep 17 00:00:00 2001 From: Daniel <25051234+dasanra@users.noreply.github.com> Date: Thu, 26 Jan 2023 08:19:08 +0000 Subject: [PATCH] chore: update CLA action to use unified repo (#648) * chore: update README badget and set Safe Bot the bot flag * chore: remove Gnosis references * chore: update mock links --- .github/actions/release/action.yml | 2 +- .github/actions/setup-env/action.yml | 4 +-- .github/workflows/cla.yml | 31 +++++++++++++------ .github/workflows/deployment.yml | 6 ++-- .github/workflows/lint.yml | 14 +++++++-- README.md | 10 +++--- apps/drain-safe/public/index.html | 2 +- .../src/__tests__/sdk-helpers.test.js | 2 +- apps/drain-safe/src/utils/test-helpers.tsx | 8 ++--- apps/ramp-network/README.md | 4 +-- apps/ramp-network/public/index.html | 2 +- apps/wallet-connect/public/index.html | 4 +-- apps/wallet-connect/public/manifest.json | 2 +- 13 files changed, 57 insertions(+), 34 deletions(-) diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml index 31a6860ae..f349231f6 100644 --- a/.github/actions/release/action.yml +++ b/.github/actions/release/action.yml @@ -39,7 +39,7 @@ runs: steps: - name: Setup git user to "🦉🤖 Safe Bot" shell: bash - run: git config user.email "-" && git config user.name "🦉🤖 Safe Bot" + run: git config user.email "-" && git config user.name "🦉🤖 Safe Bot[bot]" # Script to upload release files and notify production deployments - name: 'Upload build files to S3 and call the hook to notify ' diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml index e23840050..b27d0df44 100644 --- a/.github/actions/setup-env/action.yml +++ b/.github/actions/setup-env/action.yml @@ -21,7 +21,7 @@ runs: using: 'composite' steps: - name: Node.js setup - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: ${{ inputs.node-version }} cache: 'yarn' @@ -33,7 +33,7 @@ runs: sudo apt-get update sudo apt-get -y install python3-pip python3-dev pip install awscli --upgrade --user - - name: Project dependencies setup, node version ${{ matrix.node-version }} + - name: Project dependencies setup, node version ${{ inputs.node-version }} shell: bash run: yarn install --frozen-lockfile diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index e3e063664..63db9080d 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -11,16 +11,29 @@ jobs: steps: - name: 'CLA Assistant' if: (github.event.comment.body == 'recheckcla' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - # Alpha Release - uses: gnosis/cla-github-action@master - # GitHub token, automatically provided to the action - # (No need to define this secret in the repo settings) + # Beta Release + uses: contributor-assistant/github-action@v2.2.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # the below token should have repo scope and must be manually added by you in the repository's secret + PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACCESS_TOKEN }} with: path-to-signatures: 'signatures/version1/cla.json' - path-to-cla-document: 'https://safe.global/cla/' - branch: 'cla-signatures' - allowlist: lukasschor,mikhailxyz,rmeissner,germartinez,gabitoesmiapodo,davidalbela,Uxio0,dasanra,francovenica,tschubotz,luarx,giacomolicari,gnosis-info,bot*,DaniSomoza,yagopv,JagoFigueroa - empty-commit-flag: false - blockchain-storage-flag: false + path-to-document: 'https://safe.global/cla/' # e.g. a CLA or a DCO document + # branch should not be protected + branch: 'main' + # user names of users allowed to contribute without CLA + allowlist: mikhailxyz,rmeissner,germartinez,Uxio0,dasanra,francovenica,luarx,DaniSomoza,yagopv,JagoFigueroa,bot* + + # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken + # enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) + remote-organization-name: 'safe-global' + # enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository) + remote-repository-name: 'cla-signatures' + #create-file-commit-message: 'For example: Creating file for storing CLA Signatures' + #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' + #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' + #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' + #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.' + #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true) + #use-dco-flag: true - If you are using DCO instead of CLA diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 9866a5045..70244acfb 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.ref }} fetch-depth: 0 @@ -72,7 +72,7 @@ jobs: if: github.event_name != 'pull_request' && github.event_name != 'workflow_dispatch' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -117,7 +117,7 @@ jobs: if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 ref: main diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fc396a7c6..33c5b8549 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,5 +5,15 @@ jobs: eslint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: gnosis/safe-react-eslint-plus-action@main + - uses: actions/checkout@v3 + + - uses: actions/setup-node@v3 + with: + node-version: 18 + cache: yarn + + - name: Install Dependencies + run: yarn install --frozen-lockfile + + - name: Run eslint + run: yarn lint:check \ No newline at end of file diff --git a/README.md b/README.md index c96c22629..be6bc098b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # Safe Apps -[![Logo](https://raw.githubusercontent.com/safe-global/safe-react-apps/main/assets/logo.png)](https://gnosis-safe.io/) +[![Logo](https://raw.githubusercontent.com/safe-global/safe-react-apps/main/assets/logo.png)](https://safe.global/) ![license](https://img.shields.io/github/license/safe-global/safe-react-apps) -![build](https://img.shields.io/github/workflow/status/safe-global/safe-react-apps/Deploy%20safe%20apps/main) -![tests](https://img.shields.io/github/workflow/status/safe-global/safe-react-apps/Test/main?label=tests) +![build](https://img.shields.io/github/actions/workflow/status/safe-global/safe-react-apps/deployment.yml?branch=main) +![tests](https://img.shields.io/github/actions/workflow/status/safe-global/safe-react-apps/safe-apps-e2e.yml?branch=main) -This project contains apps developed by Gnosis to be consumed by Gnosis Safe. +This project contains apps developed by Gnosis to be consumed by the Safe. ## Install @@ -42,7 +42,7 @@ yarn start:wallet-connect ## Contracts -This project contains some test contracts to check all solidity types in the tx-builder Safe App. +This project contains some test contracts to check all solidity types in the `tx-builder` Safe App. You can deploy your own tests contracts using the following command: diff --git a/apps/drain-safe/public/index.html b/apps/drain-safe/public/index.html index da8504bdb..a04585e5f 100644 --- a/apps/drain-safe/public/index.html +++ b/apps/drain-safe/public/index.html @@ -5,7 +5,7 @@ - + diff --git a/apps/drain-safe/src/__tests__/sdk-helpers.test.js b/apps/drain-safe/src/__tests__/sdk-helpers.test.js index 07522e8da..8effc25ee 100644 --- a/apps/drain-safe/src/__tests__/sdk-helpers.test.js +++ b/apps/drain-safe/src/__tests__/sdk-helpers.test.js @@ -31,7 +31,7 @@ describe('Safe SDK helpers', () => { symbol: 'DAI', name: 'Dai', logoUri: - 'https://gnosis-safe-token-logos.s3.amazonaws.com/0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa.png', + 'https://safe-transaction-assets.staging.5afe.dev/0x5592EC0cfb4dbc12D3aB100b257153436a1f0FEa.png', }, tokenInfo: { type: 'ERC20', diff --git a/apps/drain-safe/src/utils/test-helpers.tsx b/apps/drain-safe/src/utils/test-helpers.tsx index 0ee8f341d..00ead29ea 100644 --- a/apps/drain-safe/src/utils/test-helpers.tsx +++ b/apps/drain-safe/src/utils/test-helpers.tsx @@ -97,7 +97,7 @@ export const mockInitialBalances = [ symbol: 'LINK', name: 'ChainLink Token', logoUri: - 'https://gnosis-safe-token-logos.s3.amazonaws.com/0x01BE23585060835E02B77ef475b0Cc51aA1e0709.png', + 'https://safe-transaction-assets.staging.5afe.dev/0x01BE23585060835E02B77ef475b0Cc51aA1e0709.png', }, balance: '10000000000000000000', fiatBalance: '32.17898', @@ -111,7 +111,7 @@ export const mockInitialBalances = [ symbol: 'DAI', name: 'Dai Stablecoin', logoUri: - 'https://gnosis-safe-token-logos.s3.amazonaws.com/0xc7AD46e0b8a400Bb3C915120d284AafbA8fc4735.png', + 'https://safe-transaction-assets.staging.5afe.dev/0xc7AD46e0b8a400Bb3C915120d284AafbA8fc4735.png', }, balance: '342342323423000000000000000000', fiatBalance: '24.89904', @@ -125,7 +125,7 @@ export const mockInitialBalances = [ symbol: 'MKR', name: 'Maker', logoUri: - 'https://gnosis-safe-token-logos.s3.amazonaws.com/0xF9bA5210F91D0474bd1e1DcDAeC4C58E359AaD85.png', + 'https://safe-transaction-assets.staging.5afe.dev/0xF9bA5210F91D0474bd1e1DcDAeC4C58E359AaD85.png', }, balance: '318438539290761', fiatBalance: '0.00000', @@ -139,7 +139,7 @@ export const mockInitialBalances = [ symbol: 'UNI', name: 'Uniswap', logoUri: - 'https://gnosis-safe-token-logos.s3.amazonaws.com/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984.png', + 'https://safe-transaction-assets.staging.5afe.dev/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984.png', }, balance: '1050000000000000044', fiatBalance: '3971.92584', diff --git a/apps/ramp-network/README.md b/apps/ramp-network/README.md index 2a871365a..501599b43 100644 --- a/apps/ramp-network/README.md +++ b/apps/ramp-network/README.md @@ -15,8 +15,8 @@ Then: - If HTTPS is used (by default enabled) - Open your Safe app locally (by default via https://localhost:3000/) and accept the SSL error. - Go to Safe Multisig web interface - - [Mainnet](https://app.gnosis-safe.io) - - [Rinkeby](https://rinkeby.gnosis-safe.io/app) + - [Mainnet](https://app.safe.global/?chain=eth) + - [Goerli](https://app.safe.global/?chain=gor) - Create your test safe - Go to Apps -> Manage Apps -> Add Custom App - Paste your localhost URL, default is https://localhost:3000/ diff --git a/apps/ramp-network/public/index.html b/apps/ramp-network/public/index.html index 1550cae51..95c87bfa8 100644 --- a/apps/ramp-network/public/index.html +++ b/apps/ramp-network/public/index.html @@ -21,7 +21,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - Gnosis Safe App + Ramp Network Safe App diff --git a/apps/wallet-connect/public/index.html b/apps/wallet-connect/public/index.html index a677602ad..10d325d17 100644 --- a/apps/wallet-connect/public/index.html +++ b/apps/wallet-connect/public/index.html @@ -7,7 +7,7 @@ - Gnosis Safe Multisig + WalletConnect Safe App diff --git a/apps/wallet-connect/public/manifest.json b/apps/wallet-connect/public/manifest.json index 7eb2c67e1..fc8ed1997 100644 --- a/apps/wallet-connect/public/manifest.json +++ b/apps/wallet-connect/public/manifest.json @@ -1,6 +1,6 @@ { "name": "WalletConnect", - "description": "Allows your Gnosis Safe Multisig to connect to dapps via WalletConnect.", + "description": "Allows your Safe to connect to dapps via WalletConnect.", "iconPath": "wallet-connect.svg", "icons": [ {