Merge branch 'master' into utkarsha/tnc_change

.github/workflows/build_docker_image.yml

@@ -15,8 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     env: 
       tag_name: ${{ github.event.inputs.docker_image_tag_name || github.ref_name }}
-    outputs:
-      image_name: ${{ steps.branch_name.outputs.image_name }}
     permissions:
       packages: write
       contents: read
@@ -30,7 +28,7 @@ jobs:
       - name: Convert branch name to lowercase
         id: branch_name
         run: |
-          branch_name="${{ env.tag_name }}"
+          branch_name="$tag_name"
           echo "image_name=${branch_name,,}" >> "$GITHUB_OUTPUT"
 
       - name: Log in to Docker Hub
@@ -65,10 +63,16 @@ jobs:
           TRUSTPILOT_API_KEY: ${{ secrets.TRUSTPILOT_API_KEY }}
 
       - name: Run Build Docker
-        run: docker build -t ${{ secrets.WEB_ACCESS_DOCKERHUB_USERNAME }}/${{ needs.push_to_registry.outputs.image_name }} . --platform=linux/amd64
+        env: 
+          IMAGE_NAME: ${{ steps.branch_name.outputs.image_name }} 
+        run: docker build -t ${{ secrets.WEB_ACCESS_DOCKERHUB_USERNAME }}/$IMAGE_NAME . --platform=linux/amd64
 
       - name: Run Tag Docker
-        run: docker tag ${{ secrets.WEB_ACCESS_DOCKERHUB_USERNAME }}/${{ needs.push_to_registry.outputs.image_name }} ${{ secrets.WEB_ACCESS_DOCKERHUB_USERNAME }}/${{ needs.push_to_registry.outputs.image_name }}
+        env: 
+          IMAGE_NAME: ${{ steps.branch_name.outputs.image_name }} 
+        run: docker tag ${{ secrets.WEB_ACCESS_DOCKERHUB_USERNAME }}/$IMAGE_NAME ${{ secrets.WEB_ACCESS_DOCKERHUB_USERNAME }}/$IMAGE_NAME
 
       - name: Run Push Docker
-        run: docker push ${{ secrets.WEB_ACCESS_DOCKERHUB_USERNAME }}/${{ needs.push_to_registry.outputs.image_name }}
+        env: 
+          IMAGE_NAME: ${{ steps.branch_name.outputs.image_name }} 
+        run: docker push ${{ secrets.WEB_ACCESS_DOCKERHUB_USERNAME }}/$IMAGE_NAME

.github/workflows/coveralls.yml

@@ -8,7 +8,7 @@ name: Coveralls
 jobs:
   build:
     name: Reporter
-    runs-on: Runner_8cores_Deriv-app
+    runs-on: Runner_16cores_Deriv-app
     steps:
       - name: Checkout
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11

.github/workflows/release_production.yml

@@ -103,24 +103,6 @@ jobs:
         with:
           name: build
           path: packages/core/dist
-      - name: Build Docker image and push to Docker hub and K8S
-        id: build_and_push_docker_image
-        uses: "./.github/actions/build_and_push_docker_image"
-        with:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          DOCKERHUB_ORGANISATION: ${{ secrets.DOCKERHUB_ORGANISATION }}
-          K8S_NAMESPACE: ${{ secrets.K8S_NAMESPACE }}
-          KUBE_SERVER: ${{ secrets.KUBE_SERVER }}
-          SERVICEACCOUNT_TOKEN: ${{ secrets.SERVICEACCOUNT_TOKEN }}
-          CA_CRT: ${{ secrets.CA_CRT }}
-          APP_VERSION: latest
-      - name: Send Slack Notification on Docker Publish and Kubernetes Deployment Failure
-        if: ${{ steps.build_and_push_docker_image.outcome != 'success' }}
-        uses: "deriv-com/shared-actions/.github/actions/send_slack_notification@master"
-        with:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          MESSAGE: "${{ env.RELEASE_TYPE }} Docker Publish and Kubernetes Deployment for app.deriv.com with version ${{ needs.build_test_and_publish.outputs.RELEASE_VERSION }} has Failed"
       - name: Upload to vercel
         id: vercel-upload
         uses: 'deriv-com/shared-actions/.github/actions/vercel_DR_publish@master'

__mocks__/translation.mock.js

@@ -1,12 +1,13 @@
 import React from 'react';
 
 const replaceValue = (text, values) => {
-    const valueMatch = text.match(/{{(\w+)}}/);
-    if (valueMatch) {
-        const valueKey = valueMatch[1];
-        return values[valueKey] || text;
-    }
-    return text;
+    return text.replace(/{{(\w+)}}/g, (match, key) => {
+        // If the value is an empty string, return an empty fragment to render nothing
+        if (values[key] === '') {
+            return '';
+        }
+        return values[key] || match;
+    });
 };
 
 const Localize = ({ i18n_default_text, components = [], values = {} }) => {

packages/account/package.json

@@ -31,11 +31,11 @@
     "dependencies": {
         "@binary-com/binary-document-uploader": "^2.4.8",
         "@deriv-com/analytics": "1.11.0",
-        "@deriv-com/translations": "1.3.4",
+        "@deriv-com/translations": "1.3.5",
         "@deriv-com/utils": "^0.0.25",
-        "@deriv-com/ui": "1.29.9",
+        "@deriv-com/ui": "1.29.10",
         "@deriv/api": "^1.0.0",
-        "@deriv-com/quill-ui": "1.13.36",
+        "@deriv-com/quill-ui": "1.13.42",
         "@deriv/components": "^1.0.0",
         "@deriv/hooks": "^1.0.0",
         "@deriv/integration": "1.0.0",

packages/account/src/App.tsx

@@ -1,6 +1,6 @@
 import Routes from './Containers/routes';
 import ResetTradingPassword from './Containers/reset-trading-password';
-import { NetworkStatusToastErrorPopup } from './Containers/toast-popup';
+import NetworkStatusToastPopup from './Components/network-status-toast-popup/network-status-toast-popup';
 import { APIProvider } from '@deriv/api';
 import { StoreProvider } from '@deriv/stores';
 import { TCoreStores } from '@deriv/stores/types';
@@ -21,14 +21,14 @@ const App = ({ passthrough }: TAppProps) => {
 
     return (
         <StoreProvider store={root_store}>
-            <NetworkStatusToastErrorPopup />
             <APIProvider>
                 <POIProvider>
                     {Notifications && <Notifications />}
                     <Routes />
                     <ResetTradingPassword />
                 </POIProvider>
             </APIProvider>
+            <NetworkStatusToastPopup />
         </StoreProvider>
     );
 };