[translators] Update translators branch with master 📚 (#5944)

* fix: signup provider send null (#5935) * translations: 📚 sync translations with crowdin (#5939) Co-authored-by: DerivFE <[email protected]> * Habib/gtm party town integration (#5943) * chore: add gtm to partytown url fix * chore: add partytown proxy to gtm * chore: remove semicolon * chore: remove semicolon --------- Co-authored-by: NikitK-deriv <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DerivFE <[email protected]> Co-authored-by: Habib Deriv <[email protected]>
binary-com · Nov 15, 2023 · a3899ed · a3899ed
1 parent 35b9b0c
commit a3899ed
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 65 deletions.
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -22,7 +22,8 @@ env:
     GATSBY_GROWTHBOOK_DECRYPTION_KEY: ${{ secrets.GATSBY_GROWTHBOOK_DECRYPTION_KEY }}
     GATSBY_RUDDERSTACK_STAGING_KEY: ${{ secrets.GATSBY_RUDDERSTACK_STAGING_KEY }}
     GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }}
-
+    GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
+
 jobs:
     release-beta:
         timeout-minutes: 30

diff --git a/.github/workflows/generate-preview-link.yml b/.github/workflows/generate-preview-link.yml
@@ -121,6 +121,8 @@ jobs:
                   GATSBY_RUDDERSTACK_STAGING_KEY: ${{ secrets.GATSBY_RUDDERSTACK_STAGING_KEY }}
                   GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }}
                   GATSBY_STRAPI_TOKEN: ${{ secrets.GATSBY_STRAPI_TOKEN }}
+                  GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
+
               run: npm run build
 
             - name: Publish to Cloudflare Pages

diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -18,6 +18,7 @@ env:
     GATSBY_GROWTHBOOK_DECRYPTION_KEY: ${{ secrets.GATSBY_GROWTHBOOK_DECRYPTION_KEY }}
     GATSBY_RUDDERSTACK_STAGING_KEY: ${{ secrets.GATSBY_RUDDERSTACK_STAGING_KEY }}
     GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }}
+    GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
 
 jobs:
     release-production:

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -23,6 +23,7 @@ env:
     GATSBY_RUDDERSTACK_STAGING_KEY: ${{ secrets.GATSBY_RUDDERSTACK_STAGING_KEY }}
     GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }}
     GATSBY_STRAPI_TOKEN: ${{ secrets.GATSBY_STRAPI_TOKEN }}
+    GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
 
 jobs:
     release-staging:

diff --git a/gatsby-config.js b/gatsby-config.js
@@ -349,13 +349,6 @@ module.exports = {
                 ],
             },
         },
-        {
-            resolve: 'gatsby-plugin-google-tagmanager',
-            options: {
-                id: 'GTM-NF7884S',
-                includeInDevelopment: false,
-            },
-        },
         {
             resolve: 'gatsby-plugin-anchor-links',
             options: {

diff --git a/gatsby-ssr.js b/gatsby-ssr.js
@@ -4,29 +4,39 @@ import './src/components/localization/config'
 import GlobalProvider from './src/store/global-provider'
 
 export const wrapRootElement = ({ element }) => {
-    return <GlobalProvider>{element}</GlobalProvider>
+  return <GlobalProvider>{element}</GlobalProvider>
 }
 
 export const wrapPageElement = WrapPagesWithLocaleContext
 
 export const onRenderBody = ({ setHeadComponents }) => {
-    setHeadComponents([
-        <script
-            key="partytown-vanilla-config"
-            dangerouslySetInnerHTML={{
-                __html: `partytown = {
-           resolveUrl(url, location) {
-                // Use a secure connection
-                if (url?.protocol === 'http:') {
-                  url = new URL(url.href.replace('http', 'https'))
-                }
-                // Point to our proxied URL
-                const proxyUrl = new URL(location.origin + '/__third-party-proxy')
-                proxyUrl.searchParams.append('url', url)
-                return proxyUrl
-           }
-         }`,
-            }}
-        />,
-    ])
+  const gtmTrackingId = process.env.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID || ''
+
+  setHeadComponents([
+    <script
+      key="partytown-vanilla-config"
+      dangerouslySetInnerHTML={{
+        __html: `partytown = {
+          resolveUrl(url, location) {
+            // Use a secure connection
+            if (url?.protocol === 'http:') {
+              url = new URL(url.href.replace('http', 'https'))
+            }
+            // Point to our proxied URL
+            const proxyUrl = new URL(location.origin + '/__third-party-proxy')
+            proxyUrl.searchParams.append('url', url)
+            return proxyUrl
+          }
+        }`,
+      }}
+    />,
+    gtmTrackingId && (
+      <script
+        key="gtm-script"
+        dangerouslySetInnerHTML={{
+          __html: `(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 'https://www.googletagmanager.com/gtm.js?id='+i+dl+'';f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer', '${gtmTrackingId}');`,
+        }}
+      />
+    ),
+  ])
 }