Master origin

.eslintrc

@@ -4,7 +4,8 @@
         "eslint:recommended",
         "plugin:react/recommended",
         "plugin:import/errors",
-        "plugin:import/warnings"
+        "plugin:import/warnings",
+        "plugin:react-hooks/recommended"
     ],
     "overrides": [
         {
@@ -32,6 +33,8 @@
         "strict": 0,
         "camelcase": 0,
         "no-console": "warn",
+        "react-hooks/rules-of-hooks": "error",
+        "react-hooks/exhaustive-deps": "warn",
         "no-trailing-spaces": [
             "error",
             {

.github/CODEOWNERS

@@ -57,7 +57,7 @@
 # (in case no pattern matches a path in a PR - this should be treated as a bug and result in adding the path to CODEOWNERS)
 # ==============================================================
 
-*                                                               @habib-deriv @prince-deriv
+*                                                               @habib-deriv @prince-deriv @michio-rework
 
 
 

.github/workflows/content.yml

@@ -67,14 +67,6 @@ jobs:
             - name: Set version env variable
               run: echo "GATSBY_DERIV_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-            - name: Cache dependencies
-              uses: actions/cache@v2
-              with:
-                  path: ~/.npm
-                  key: ${{ runner.os }}-node-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
-                  restore-keys: |
-                      ${{ runner.os }}-node-${{ secrets.CACHE_VERSION }}
-
             - name: Cache Gatsby
               id: gatsby-cache-build
               uses: actions/cache@v2
@@ -126,6 +118,16 @@ jobs:
                   echo ${{ secrets.CA_CRT}} | base64 --decode > ca.crt
                   ./release.sh deriv-com ${{ steps.get_tag_name.outputs.VERSION }}
 
+            - name: Deploy to Cloudflare ☁️
+              uses: cloudflare/[email protected]
+              with:
+                apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                command: pages publish public --project-name=deriv-com-pages --branch=main
+
+            - name: Cloudflare production link ✨
+              run: echo "New website - http://cf-pages-deriv-com.deriv.com"
+
             - name: Slack Notification 📣
               uses: 8398a7/action-slack@v3
               with:

.github/workflows/production.yml

@@ -24,17 +24,11 @@ jobs:
               uses: actions/[email protected]
 
             - name: Set up Node.js
-              uses: actions/setup-node@v1
+              uses: actions/setup-node@v3
               with:
                   node-version: 14
-            - name: Cache dependencies
-              id: cache
-              uses: actions/cache@v2
-              env:
-                  cache-name: cache-node-modules
-              with:
-                  path: ./node_modules
-                  key: modules-${{ hashFiles('package-lock.json') }}
+                  cache: 'npm'
+
             - name: Install Node.js dependencies
               run: |
                   npm ci
@@ -50,21 +44,14 @@ jobs:
               uses: actions/[email protected]
 
             - name: Setup Node
-              uses: actions/setup-node@v2.1.2
+              uses: actions/setup-node@v3
               with:
                   node-version: '14.x'
+                  cache: 'npm'
 
             - name: Set version env variable
               run: echo "GATSBY_DERIV_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-            - name: Cache dependencies
-              uses: actions/cache@v2
-              with:
-                  path: ~/.npm
-                  key: ${{ runner.os }}-node-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
-                  restore-keys: |
-                      ${{ runner.os }}-node-${{ secrets.CACHE_VERSION }}
-
             - name: Cache Gatsby
               id: gatsby-cache-build
               uses: actions/cache@v2
@@ -97,7 +84,8 @@ jobs:
             - name: Verify nginx image
               run: |
                   set -e
-                  #docker run --rm -it --entrypoint sh ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:latest -c "nginx -t"
+                  docker run --rm ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:$GIT_TAG_NAME nginx -t
+                  echo "docker image validated successfully"
 
             - name: Pushing Image to docker hub 🐳
               run: |
@@ -117,6 +105,16 @@ jobs:
                   echo ${{ secrets.CA_CRT}} | base64 --decode > ca.crt
                   ./release.sh deriv-com $GIT_TAG_NAME
 
+            - name: Deploy to Cloudflare ☁️
+              uses: cloudflare/[email protected]
+              with:
+                apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                command: pages publish public --project-name=deriv-com-pages --branch=main
+
+            - name: Cloudflare production link ✨
+              run: echo "New website - http://cf-pages-deriv-com.deriv.com"
+
             - name: Slack Notification 📣
               uses: 8398a7/action-slack@v3
               with:

.github/workflows/staging.yml

@@ -1,132 +1,119 @@
 name: Release Staging
 
 on:
-    push:
-        branches:
-            - master
-        paths-ignore:
-            - '**.md'
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - "**.md"
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}
-    cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
-    GATSBY_CPU_COUNT: 2
-    GATSBY_ENV: staging
-    DIRECTUS_AUTH_TOKEN: ${{ secrets.DIRECTUS_AUTH_TOKEN }}
-    GATSBY_DIRECTUS_AUTH_TOKEN: ${{ secrets.GATSBY_DIRECTUS_AUTH_TOKEN }}
-    GATSBY_ENV_CIO_SITE_ID: ${{ secrets.GATSBY_ENV_CIO_SITE_ID }}
+  GATSBY_CPU_COUNT: 2
+  GATSBY_ENV: staging
+  DIRECTUS_AUTH_TOKEN: ${{ secrets.DIRECTUS_AUTH_TOKEN }}
+  GATSBY_DIRECTUS_AUTH_TOKEN: ${{ secrets.GATSBY_DIRECTUS_AUTH_TOKEN }}
+  GATSBY_ENV_CIO_SITE_ID: ${{ secrets.GATSBY_ENV_CIO_SITE_ID }}
 
 jobs:
-    lint:
-        timeout-minutes: 10
-        runs-on: ubuntu-latest
-        environment: staging
-
-        steps:
-            - name: Checkout 🛎️
-              uses: actions/[email protected]
-
-            - name: Set up Node.js
-              uses: actions/setup-node@v1
-              with:
-                  node-version: 14
-            - name: Cache dependencies
-              id: cache
-              uses: actions/cache@v2
-              env:
-                  cache-name: cache-node-modules
-              with:
-                  path: ./node_modules
-                  key: modules-${{ hashFiles('package-lock.json') }}
-            - name: Install Node.js dependencies
-              run: |
-                  npm ci
-                  npm test
-
-    release-staging:
-        needs: lint
-        timeout-minutes: 30
-        runs-on: ubuntu-latest
-        environment: staging
-        steps:
-            - name: Checkout 🛎️
-              uses: actions/[email protected]
-
-            - name: Setup Node
-              uses: actions/[email protected]
-              with:
-                  node-version: '14.x'
-
-            - name: Cache dependencies
-              uses: actions/cache@v2
-              with:
-                  path: ~/.npm
-                  key: ${{ runner.os }}-node-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
-                  restore-keys: |
-                      ${{ runner.os }}-node-${{ secrets.CACHE_VERSION }}
-
-            - name: Cache Gatsby
-              id: gatsby-cache-build
-              uses: actions/cache@v2
-              with:
-                  path: |
-                      public
-                      .cache
-                  key: ${{ runner.os }}-gatsby-build-${{ secrets.CACHE_VERSION }}-${{ github.run_id }}
-                  restore-keys: |
-                      ${{ runner.os }}-gatsby-build-${{ secrets.CACHE_VERSION }}
-
-            - run: npm ci
-            - run: npm run format
-            - run: npm run test
-            - run: npm run build
-            - run: npm run build:storybook
-            - uses: olegtarasov/[email protected]
-              id: tagName
-              # For using same tag for staging and production we need to uncomment these two below lines:
-              # with:
-              #   tagRegex: "staging(.*)"
-            - name: Building docker image 🐳
-              run: docker build -t ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:latest-staging  -t ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:$GITHUB_SHA .
-
-            - name: Verify nginx image
-              run: |
-                  set -e
-                  #docker run --rm -it --entrypoint sh ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:latest-staging -c "nginx -t"
-
-            - name: Pushing Image to docker hub 🐳
-              run: |
-                  echo ${{ secrets.DOCKERHUB_PASSWORD }}| docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-                  docker push  ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:latest-staging
-                  docker push  ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:$GITHUB_SHA
-
-            - name: Deploy 🚀
-              run: |
-                  export NAMESPACE="deriv-com-staging"
-                  export SERVICEACCOUNT_TOKEN=${{ secrets.SERVICEACCOUNT_TOKEN }}
-                  export DOCKERHUB_ORGANISATION=${{ secrets.DOCKERHUB_ORGANISATION }}
-                  export KUBE_SERVER=${{ secrets.KUBE_SERVER }}
-                  export CA=${{ secrets.CA }}
-                  git clone https://github.com/binary-com/devops-ci-scripts
-                  cd devops-ci-scripts/k8s-build_tools
-                  echo ${{ secrets.CA_CRT}} | base64 --decode > ca.crt
-                  ./release.sh deriv-com $GITHUB_SHA
-
-            - name: Slack Notification 📣
-              uses: 8398a7/action-slack@v3
-              with:
-                  status: ${{ job.status }}
-                  fields: workflow,repo
-                  if_mention: failure,cancelled
-                  custom_payload: |
-                      {
-                        attachments: [{
-                          color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
-                          text: `Release for *Deriv.com* with version *$GITHUB_SHA*`
-                        }]
-                      }
-              env:
-                  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-              if: always()
+  lint:
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+    environment: staging
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/[email protected]
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 14
+          cache: "npm"
+
+      - name: Install Node.js dependencies
+        run: |
+          npm ci
+          npm test
+
+  release-staging:
+    needs: lint
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    environment: staging
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/[email protected]
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "14.x"
+          cache: "npm"
+
+      - run: npm ci
+      - run: npm run format
+      - run: npm run test
+      - run: npm run build
+      - run: npm run build:storybook
+      - uses: olegtarasov/[email protected]
+        id: tagName
+        # For using same tag for staging and production we need to uncomment these two below lines:
+        # with:
+        #   tagRegex: "staging(.*)"
+      - name: Building docker image 🐳
+        run: docker build -t ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:latest-staging  -t ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:$GITHUB_SHA .
+
+      - name: Verify nginx image
+        run: |
+          set -e
+          docker run --rm ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:$GITHUB_SHA nginx -t
+          echo "docker image validated successfully"
+
+      - name: Pushing Image to docker hub 🐳
+        run: |
+          echo ${{ secrets.DOCKERHUB_PASSWORD }}| docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+          docker push  ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:latest-staging
+          docker push  ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:$GITHUB_SHA
+
+      - name: Deploy 🚀
+        run: |
+          export NAMESPACE="deriv-com-staging"
+          export SERVICEACCOUNT_TOKEN=${{ secrets.SERVICEACCOUNT_TOKEN }}
+          export DOCKERHUB_ORGANISATION=${{ secrets.DOCKERHUB_ORGANISATION }}
+          export KUBE_SERVER=${{ secrets.KUBE_SERVER }}
+          export CA=${{ secrets.CA }}
+          git clone https://github.com/binary-com/devops-ci-scripts
+          cd devops-ci-scripts/k8s-build_tools
+          echo ${{ secrets.CA_CRT}} | base64 --decode > ca.crt
+          ./release.sh deriv-com $GITHUB_SHA
+
+      - name: Deploy to Cloudflare ☁️
+        uses: cloudflare/[email protected]
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages publish public --project-name=deriv-com-pages --branch=staging
+
+      - name: Cloudflare preview link ✨
+        run: echo "New staging website - http://staging.cf-pages-deriv-com.deriv.com"
+
+      - name: Slack Notification 📣
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ job.status }}
+          fields: workflow,repo
+          if_mention: failure,cancelled
+          custom_payload: |
+            {
+              attachments: [{
+                color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
+                text: `Release for *Deriv.com* with version *$GITHUB_SHA*`
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+        if: always()