Merge branch 'release/0.16.0' into master-cere

.env.dev

@@ -9,7 +9,7 @@ REACT_APP_SUPPORT_URL="https://t.me/ceretroubleshooting"
 ## These are only required if using Sentry for error logging
 REACT_APP_SENTRY_DSN_URL="https://[email protected]/5987177"
 SENTRY_AUTH_TOKEN="db67ae12222811ecabd2564b6436d30d"
-REACT_APP_SENTRY_RELEASE="0.15.0"
+REACT_APP_SENTRY_RELEASE="0.16.0"
 
 REACT_APP_MAINTENANCE=false
 REACT_APP_CONNECT_WITH_SUBSTRATE_WALLET_ENABLED=true

.env.prod

@@ -9,7 +9,7 @@ REACT_APP_SUPPORT_URL="https://t.me/ceretroubleshooting"
 ## These are only required if using Sentry for error logging
 REACT_APP_SENTRY_DSN_URL="https://[email protected]/5987177"
 SENTRY_AUTH_TOKEN="db67ae12222811ecabd2564b6436d30d"
-REACT_APP_SENTRY_RELEASE="0.15.0"
+REACT_APP_SENTRY_RELEASE="0.16.0"
 
 REACT_APP_MAINTENANCE=false
 REACT_APP_CONNECT_WITH_SUBSTRATE_WALLET_ENABLED=true

.env.stage

@@ -9,7 +9,7 @@ REACT_APP_SUPPORT_URL="https://t.me/ceretroubleshooting"
 ## These are only required if using Sentry for error logging
 REACT_APP_SENTRY_DSN_URL="https://[email protected]/5987177"
 SENTRY_AUTH_TOKEN="db67ae12222811ecabd2564b6436d30d"
-REACT_APP_SENTRY_RELEASE="0.15.0"
+REACT_APP_SENTRY_RELEASE="0.16.0"
 
 REACT_APP_MAINTENANCE=false
 REACT_APP_CONNECT_WITH_SUBSTRATE_WALLET_ENABLED=true

.github/workflows/dev.yaml

@@ -0,0 +1,68 @@
+name: Release to dev
+on:
+  push:
+    branches:
+      - dev-cere
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: [self-hosted, cere-network-large-workers]
+    container:
+      image: node:14-buster
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install system packages
+        run: |
+          apt update
+          apt install -y python3
+      - name: Restore cache
+        uses: actions/cache@v2
+        with:
+          path: 'node_modules'
+          key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
+      - name: Install packages
+        run: |
+          cp .env.dev .env
+          sh ./scripts/copy-dev-config.sh
+          yarn install
+      - name: Build
+        env: 
+          CI: false
+        run: yarn build
+      - name: Prepare artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: build
+          path: build
+
+  deploy:
+    runs-on: [self-hosted, cere-network-large-workers]
+    needs: build
+    container:
+      image: ubuntu:20.04
+    steps:
+      - name: Restore build
+        uses: actions/download-artifact@v2
+        with:
+          name: build
+          path: build
+      - name: Install aws-cli
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          apt update
+          apt install -y awscli
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.DEV_NETWORK_AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.DEV_NETWORK_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+      - name: Deploy
+        env:
+          S3_BUCKET: ${{ secrets.S3_BUCKET_NAME_DEV }}
+          CF_DISTRIBUTION_ID: ${{ secrets.CF_DISTRIBUTION_ID_DEV }}
+        run: |
+          aws s3 sync --metadata-directive="REPLACE" build/ s3://${S3_BUCKET}
+          aws cloudfront create-invalidation --distribution-id ${CF_DISTRIBUTION_ID} --paths "/*"

.github/workflows/prod.yaml

@@ -0,0 +1,67 @@
+name: Release to prod
+on:
+  push:
+    branches:
+      - master-cere
+
+jobs:
+  build:
+    runs-on: [self-hosted, cere-network-large-workers]
+    container:
+      image: node:14-buster
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install system packages
+        run: |
+          apt update
+          apt install -y python3
+      - name: Restore cache
+        uses: actions/cache@v2
+        with:
+          path: 'node_modules'
+          key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
+      - name: Install packages
+        run: |
+          cp .env.prod .env
+          sh ./scripts/copy-prod-config.sh
+          yarn install
+      - name: Build
+        env: 
+          CI: false
+        run: yarn build
+      - name: Prepare artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: build
+          path: build
+
+  deploy:
+    runs-on: [self-hosted, cere-network-large-workers]
+    needs: build
+    container:
+      image: ubuntu:20.04
+    steps:
+      - name: Restore build
+        uses: actions/download-artifact@v2
+        with:
+          name: build
+          path: build
+      - name: Install aws-cli
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          apt update
+          apt install -y awscli
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.PRD_NETWORK_AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.PRD_NETWORK_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+      - name: Deploy
+        env:
+          S3_BUCKET: ${{ secrets.S3_BUCKET_NAME_PRD }}
+          CF_DISTRIBUTION_ID: ${{ secrets.CF_DISTRIBUTION_ID_PRD }}
+        run: |
+          aws s3 sync --metadata-directive="REPLACE" build/ s3://${S3_BUCKET}
+          aws cloudfront create-invalidation --distribution-id ${CF_DISTRIBUTION_ID} --paths "/*"

.github/workflows/stage.yaml

@@ -0,0 +1,68 @@
+name: Release to stage
+on:
+  push:
+    branches:
+      - 'release/**'
+      - 'hotfix/**'
+
+jobs:
+  build:
+    runs-on: [self-hosted, cere-network-large-workers]
+    container:
+      image: node:14-buster
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install system packages
+        run: |
+          apt update
+          apt install -y python3
+      - name: Restore cache
+        uses: actions/cache@v2
+        with:
+          path: 'node_modules'
+          key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
+      - name: Install packages
+        run: |
+          cp .env.stage .env
+          sh ./scripts/copy-stage-config.sh
+          yarn install
+      - name: Build
+        env: 
+          CI: false
+        run: yarn build
+      - name: Prepare artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: build
+          path: build
+
+  deploy:
+    runs-on: [self-hosted, cere-network-large-workers]
+    needs: build
+    container:
+      image: ubuntu:20.04
+    steps:
+      - name: Restore build
+        uses: actions/download-artifact@v2
+        with:
+          name: build
+          path: build
+      - name: Install aws-cli
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          apt update
+          apt install -y awscli
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.STG_NETWORK_AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.STG_NETWORK_AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+      - name: Deploy
+        env:
+          S3_BUCKET: ${{ secrets.S3_BUCKET_NAME_STG }}
+          CF_DISTRIBUTION_ID: ${{ secrets.CF_DISTRIBUTION_ID_STG }}
+        run: |
+          aws s3 sync --metadata-directive="REPLACE" build/ s3://${S3_BUCKET}
+          aws cloudfront create-invalidation --distribution-id ${CF_DISTRIBUTION_ID} --paths "/*"

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## vNext
 
+- ...
+
+## v0.16.0
+
+- Rename ERC20 to ERC-20
+
 ## v0.15.0
 
 - Updated Devnet url

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@Cerebellum-Network/chainbridge-ui",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "private": true,
   "dependencies": {
     "@babel/core": "^7.12.3",

src/Components/Pages/TransferPage.tsx

@@ -530,11 +530,11 @@ const TransferPage = () => {
               </>
             ) : walletType === "Ethereum" ? (
               <span className={classes.title}>
-                Transfer Tokens (ERC20 to Native)
+                Transfer Tokens (ERC-20 to Native)
               </span>
             ) : (
               <span className={classes.title}>
-                Transfer Tokens (Native to ERC20)
+                Transfer Tokens (Native to ERC-20)
               </span>
             ))}
         </div>
@@ -559,7 +559,7 @@ const TransferPage = () => {
                   className={classes.EthWalletBtn}
                   onClick={() => setWalletType("Ethereum")}
                 >
-                  Connect with ERC20 Wallet
+                  Connect with ERC-20 Wallet
                 </Button>
                 {process.env.REACT_APP_CONNECT_WITH_SUBSTRATE_WALLET_ENABLED ===
                   "true" && (