Merge branch 'master' into henry/84816/change-binary-smarttrader-higherlower-to-risefall

Author: HENRY

.circleci/config.yml

@@ -3,33 +3,6 @@ orbs:
   k8s: circleci/kubernetes@0.7.0
   slack: circleci/slack@3.4.2
 commands:
-  git_checkout_from_cache:
-    description: "Git checkout and save cache"
-    steps:
-      - restore_cache:
-          keys:
-            - source-v1-{{ .Branch }}-{{ .Revision }}
-            - source-v1-{{ .Branch }}-
-            - source-v1-
-      - run: 
-          name: Fetch git tags 
-          command: |
-            mkdir -p ~/.ssh
-            ssh-keyscan github.com >> ~/.ssh/known_hosts
-            echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== ' >> ~/.ssh/known_hosts
-            # Fetch tags if git cache is present
-            if [ -e /home/circleci/project/.git ]
-            then
-              git fetch origin --tags
-            fi
-      - checkout
-      - run:
-          name: Compress git objects 
-          command: git gc
-      - save_cache:
-          key: source-v1-{{ .Branch }}-{{ .Revision }}
-          paths:
-            - ".git"
   npm_install:
     description: "npm install and save cache"
     steps:
@@ -60,15 +33,12 @@ commands:
       - run:
           name: Building dist for << parameters.target >>
           command: node_modules/grunt/bin/grunt releaseci --<< parameters.target >>
-  deploy:
-    description: "Deploy to static branches"
+  versioning:
+    description: "Add version to build"
     parameters:
       target_branch:
         type: string
     steps:
-      - checkout
-      - attach_workspace:
-          at: dist
       - run:
           name: Tag build
           command: echo "<< parameters.target_branch >> $(date -u +'%Y-%m-%dT%H:%M:%SZ')" > dist/version
@@ -148,25 +118,27 @@ jobs:
     docker:
       - image: circleci/node:14-stretch
     steps:
-      - git_checkout_from_cache
+      - checkout
       - npm_install
       - test
   release_staging:
     docker:
       - image: circleci/node:14-stretch
     steps:
-      - git_checkout_from_cache
+      - checkout
       - npm_install
       - test
       - build:
          target: 'staging'
       - build:
           target: 'translations'
+      - versioning:
+          target_branch: "staging"
       - persist_to_workspace:
           root: dist
           paths:
             - .
-      - deploy:
+      - versioning:
           target_branch: "staging"
       - docker_build_push
       - k8s_deploy
@@ -175,42 +147,32 @@ jobs:
     docker:
       - image: circleci/node:14-stretch
     steps:
-      - git_checkout_from_cache
+      - checkout
       - npm_install
       - test
       - build:
           target: 'production'
+      - versioning:
+          target_branch: "production"
       - persist_to_workspace:
           root: dist
           paths:
             - .
-      - deploy:
-          target_branch: "production"
-      - notify_slack
-  release_aws_production:
-    docker:
-      - image: circleci/node:14-stretch
-    steps:
-      - git_checkout_from_cache
-      - npm_install
-      - test
-      - build:
-          target: 'production'
       - docker_build_push:
           docker_latest_image_tag: latest
           docker_image_tag: ${CIRCLE_TAG}
       - k8s_deploy:
           k8s_svc_name: "production-binary-com"
           k8s_namespace: "www-binary-com-production"
           k8s_version: ${CIRCLE_TAG}
+      - notify_slack
   publish_cloudflare_staging:
     docker:
       - image: circleci/node:16.13.1-stretch
     steps:
       - attach_workspace:
           at: dist
       - publish_to_pages_staging
-
   publish_cloudflare_production:
     docker:
       - image: circleci/node:16.13.1-stretch
@@ -232,6 +194,7 @@ workflows:
           filters:
             branches:
               only: /^master$/
+          context: binary-frontend-artifact-upload
       - publish_cloudflare_staging:
           requires:
             - release_staging
@@ -245,12 +208,6 @@ workflows:
               ignore: /.*/
             tags:
               only: /^production.*/
-      - release_aws_production:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^production.*/
           context: binary-frontend-artifact-upload
       - publish_cloudflare_production:
           requires:

.github/workflows/generate_app_id.yml

@@ -14,6 +14,7 @@ jobs:
               uses: binary-com/vercel-preview-url-action@v1.0.5
               with:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  preview_url_regexp: \[Visit Preview\]\((.*?.sx)\)
             - name: Generate Binary App ID for deployment Preview URL
               id: generate_app_id
               uses: DerivFE/binary-app-id-action@master

.github/workflows/sync_crowdin_translations.yml

@@ -1,5 +1,13 @@
 name: Sync Crowdin translations
 
+permissions:
+  actions: write
+  checks: write
+  contents: write
+  deployments: write
+  pull-requests: write
+  statuses: write
+
 on:
   workflow_dispatch:
   push:
@@ -33,7 +41,7 @@ jobs:
           git config --global user.email "80095553+DerivFE@users.noreply.github.com"
 
           echo "Installing Crowdin CLI"
-          sudo npm i -g @crowdin/cli
+          sudo npm i -g @crowdin/cli@3.7.8
           echo "Installing project dependencies and building the project"
           npm install
           npm run build

scripts/common.js

@@ -5,7 +5,7 @@ const util  = require('util');
 
 exports.root_path = require('app-root-path').path;
 
-// ---------- Pages config ----------
+// --------- Pages config ----------
 exports.pages = require('./config/pages.js').map(p => ({
     save_as      : p[0],
     tpl_path     : p[1],

scripts/js_texts/extracted_strings_app.js

@@ -12,6 +12,7 @@ module.exports = [
     'Account balance:',
     'Account currency',
     'Accounts List',
+    'Accumulator',
     'Acknowledge',
     'Action',
     'Action required!',
@@ -256,6 +257,7 @@ module.exports = [
     'Go to DTrader',
     'Go to Deriv',
     'Go to Deriv to add an MT5 account',
+    'Go to Deriv to add an account',
     'Go to statement',
     'Goes Outside',
     'Got it',