fix: merge conflicts

.eslintrc

@@ -28,6 +28,7 @@
             ],
             "rules": {
                 "@typescript-eslint/explicit-module-boundary-types": "off",
+                "import/no-named-as-default": "off",
                 "deprecation/deprecation": "warn"
             },
             "parserOptions": {
@@ -83,7 +84,7 @@
                 ]
             }
         ],
-        "import/no-useless-path-segments": "error",
+        // "import/no-useless-path-segments": "error",
         "import/prefer-default-export": 0,
         "import/order": [
             "error",
@@ -132,21 +133,16 @@
         "jest": true
     },
     "settings": {
+        "import/parsers": {
+            "@typescript-eslint/parser": [".ts", ".tsx"]
+        },
         "import/resolver": {
+            "typescript": {
+                "project": ["tsconfig.json", "themes/gatsby-theme-deriv/tsconfig.json"]
+            },
             "node": {
-                "paths": [
-                    "src"
-                ],
-                "extensions": [
-                    ".js",
-                    ".jsx",
-                    ".ts",
-                    ".tsx"
-                ]
+                "project": ["tsconfig.json", "themes/gatsby-theme-deriv/tsconfig.json"]
             }
-        },
-        "react": {
-            "version": "17"
         }
     }
 }

.github/workflows/beta.yml

@@ -24,6 +24,7 @@ env:
     GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }}
     GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
     GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
+    GATSBY_DATABASE_URL: ${{ secrets.GATSBY_DATABASE_URL }}
 
 jobs:
     release-beta:
@@ -52,7 +53,7 @@ jobs:
             # - run: npm run format
             # - run: npm run test
             - run: npm run build
-            - uses: olegtarasov/get-tag@v2.1
+            - uses: olegtarasov/get-tag@53af8e1e538a0ffab949cdde3e332d8e58e8630f
               id: tagName
               # For using same tag for staging and production we need to uncomment these two below lines:
               # with:
@@ -69,7 +70,7 @@ jobs:
               run: echo "New beta website - https://beta.deriv.com"
 
             - name: Slack Notification 📣
-              uses: 8398a7/action-slack@v3
+              uses: 8398a7/action-slack@21dc5d142b92115d9c154540e48df504ad4e9cf9
               with:
                   status: ${{ job.status }}
                   fields: workflow,repo

.github/workflows/corewebvitals.yml

@@ -53,7 +53,7 @@ jobs:
                   DATADOG_APP_KEY: ${{ secrets.GATSBY_DATADOG_APPLICATION_ID }}
 
             - name: Post audit comment
-              uses: marocchino/sticky-pull-request-comment@v2
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   header: Core Web Vitals Audit
@@ -64,7 +64,7 @@ jobs:
                       - Cumulative Layout Shift: ${{ steps.results.outputs.cls }}
 
             - name: Slack Notification 📣
-              uses: 8398a7/action-slack@v3
+              uses: 8398a7/action-slack@21dc5d142b92115d9c154540e48df504ad4e9cf9
               if: ${{ failure() }}
               with:
                   status: custom

.github/workflows/generate-preview-link-eu.yml

@@ -16,10 +16,9 @@ concurrency:
 jobs:
     build_eu_to_cloudflare_pages:
         runs-on: Ubuntu-latest
-        if: contains(github.event.pull_request.head.ref, 'multiple-build')
         permissions:
-          checks: write
-          pull-requests: write
+            checks: write
+            pull-requests: write
         steps:
             - name: Verify user
               uses: 'deriv-com/shared-actions/.github/actions/verify_user_in_organization@v1'
@@ -47,9 +46,8 @@ jobs:
                           ''
                         ].join('\n')
                       core.setOutput("comment", comment);
-
             - name: Post Cloudflare Pages Preview comment
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages EU Preview Comment
                   number: ${{github.event.pull_request.user.login}}
@@ -59,14 +57,6 @@ jobs:
             - name: Setup node
               uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8
 
-            - name: Create npmrc file
-              shell: bash
-              run: echo "@deriv-com:registry=https://npm.pkg.github.com" >> .npmrc
-
-            - name: Setup install read-only token for deriv-com org
-              shell: bash
-              run: echo '//npm.pkg.github.com/:_authToken=${{ secrets.READ_DERIV_COM_ORG_PACKAGES }}' >> .npmrc
-
             - name: Get build output from master cache
               uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c
               with:
@@ -76,9 +66,8 @@ jobs:
                   path: |
                       sites/eu/.cache
                       sites/eu/public
-
             - name: Install Dependencies
-              uses: "./.github/actions/npm_install_from_cache"
+              uses: './.github/actions/npm_install_from_cache'
 
             - name: Build project
               id: build-project
@@ -92,20 +81,21 @@ jobs:
                   GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
                   GATSBY_TRUSTPILOT_API_KEY: ${{ secrets.GATSBY_TRUSTPILOT_API_KEY }}
                   GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
+                  GATSBY_DATABASE_URL: ${{ secrets.GATSBY_DATABASE_URL }}
 
               run: npm run build:eu
-
             - name: Retrieve PR information
               env:
                   EVENT_NUMBER: ${{ github.event.number }}
                   EVENT_USERNAME: ${{ github.event.pull_request.user.login }}
                   HEAD_REF: ${{ github.head_ref }}
+                  DRAFT: ${{ github.event.pull_request.draft }}
               run: |
                   mkdir -p .pr
                   echo "$EVENT_NUMBER" > .pr/NR
                   echo "$EVENT_USERNAME" > .pr/USERNAME
                   echo "$HEAD_REF" > .pr/BRANCHNAME
-
+                  echo "$DRAFT" > .pr/DRAFT
             - name: Publish to Cloudflare Pages
               id: publish-to-pages
               env:
@@ -130,7 +120,6 @@ jobs:
                     echo "Deployment to Cloudflare Pages failed."
                     exit 1
                   fi
-
             - name: 'Generate preview link comment'
               if: success()
               id: generate_preview_url
@@ -168,7 +157,7 @@ jobs:
                       core.setOutput("comment", comment);
             - name: Post Cloudflare Pages Preview comment
               if: success() || failure()
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages Preview Comment
                   number: ${{github.event.number}}
@@ -179,4 +168,4 @@ jobs:
               uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
               with:
                   name: 'pr-${{github.run_id}}'
-                  path: .pr
+                  path: .pr

.github/workflows/generate-preview-link-row.yml

@@ -16,11 +16,9 @@ concurrency:
 jobs:
     build_row_to_cloudflare_pages:
         runs-on: Ubuntu-latest
-        # To be removed once released in production
-        if: contains(github.event.pull_request.head.ref, 'multiple-build')
         permissions:
-          checks: write
-          pull-requests: write
+            checks: write
+            pull-requests: write
         steps:
             - name: Verify user
               uses: 'deriv-com/shared-actions/.github/actions/verify_user_in_organization@v1'
@@ -50,7 +48,7 @@ jobs:
                       core.setOutput("comment", comment);
 
             - name: Post Cloudflare Pages Preview comment
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages ROW Preview Comment
                   number: ${{github.event.pull_request.user.login}}
@@ -60,14 +58,6 @@ jobs:
             - name: Setup node
               uses: actions/setup-node@7c12f8017d5436eb855f1ed4399f037a36fbd9e8
 
-            - name: Create npmrc file
-              shell: bash
-              run: echo "@deriv-com:registry=https://npm.pkg.github.com" >> .npmrc
-
-            - name: Setup install read-only token for deriv-com org
-              shell: bash
-              run: echo '//npm.pkg.github.com/:_authToken=${{ secrets.READ_DERIV_COM_ORG_PACKAGES }}' >> .npmrc
-
             - name: Get build output from master cache
               uses: actions/cache/restore@e12d46a63a90f2fae62d114769bbf2a179198b5c
               with:
@@ -79,7 +69,7 @@ jobs:
                       sites/row/public
 
             - name: Install Dependencies
-              uses: "./.github/actions/npm_install_from_cache"
+              uses: './.github/actions/npm_install_from_cache'
 
             - name: Build project
               id: build-project
@@ -93,6 +83,7 @@ jobs:
                   GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
                   GATSBY_TRUSTPILOT_API_KEY: ${{ secrets.GATSBY_TRUSTPILOT_API_KEY }}
                   GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
+                  GATSBY_DATABASE_URL: ${{ secrets.GATSBY_DATABASE_URL }}
 
               run: npm run build:row
 
@@ -101,12 +92,13 @@ jobs:
                   EVENT_NUMBER: ${{ github.event.number }}
                   EVENT_USERNAME: ${{ github.event.pull_request.user.login }}
                   HEAD_REF: ${{ github.head_ref }}
+                  DRAFT: ${{ github.event.pull_request.draft }}
               run: |
                   mkdir -p .pr
                   echo "$EVENT_NUMBER" > .pr/NR
                   echo "$EVENT_USERNAME" > .pr/USERNAME
                   echo "$HEAD_REF" > .pr/BRANCHNAME
-
+                  echo "$DRAFT" > .pr/DRAFT
             - name: Publish to Cloudflare Pages
               id: publish-to-pages
               env:
@@ -169,7 +161,7 @@ jobs:
                       core.setOutput("comment", comment);
             - name: Post Cloudflare Pages Preview comment
               if: success() || failure()
-              uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd
+              uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31
               with:
                   header: Cloudflare Pages Preview Comment
                   number: ${{github.event.number}}