fix: resolve conflict

deriv-com · Sep 5, 2024 · 7421fb1 · 7421fb1
2 parents 1b4ebb6 + 072c92c
commit 7421fb1
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 2 deletions.
diff --git a/.github/workflows/release_production.yml b/.github/workflows/release_production.yml
@@ -96,5 +96,5 @@ jobs:
         if: always() && ${{ steps.publish_to_vercel.outcome != 'success'}}
         uses: ./.github/actions/notify_slack
         with:
-          RELEASE_TYPE: ${{ env.RELEASE_TYPE }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
           MESSAGE: "Publish to vercel failed for '${{ env.RELEASE_TYPE }}' release on api.deriv.com with version *'${{ needs.build_and_publish.outputs.RELEASE_VERSION }}"
diff --git a/config/v3/proposal/receive.json b/config/v3/proposal/receive.json
@@ -363,6 +363,18 @@
                             "type": "integer",
                             "examples": 75
                         },
+                        "payout": {
+                            "description": "Contains information for minimum and maximum payout amount for the contract.",
+                            "type": "object",
+                            "additionalProperties": false,
+                            "properties": {
+                                "max": {
+                                    "description": "Maximum payout allowed",
+                                    "type": "string",
+                                    "examples": "1000.00"
+                                }
+                            }
+                        },
                         "stake": {
                             "description": "Contains information for minimum and maximum stake amount for the contract.",
                             "type": "object",

diff --git a/jest.config.js b/jest.config.js
@@ -36,6 +36,7 @@ module.exports = {
     '@site/(.*)': '<rootDir>/$1',
     '\\.(css|scss|sass|less)$': 'identity-obj-proxy',
     '@deriv-com/quill-ui': 'node_modules/@deriv-com/quill-ui/dist/main.js',
+    '\\.(svg)$': '<rootDir>/src/__mocks__/file.mock.ts',
   },
   moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'mjs', 'json'],
   rootDir: '.',

diff --git a/src/__mocks__/file.mock.ts b/src/__mocks__/file.mock.ts
@@ -0,0 +1 @@
+module.exports = 'SVGMock';
diff --git a/src/assets/gray-logo.svg b/src/assets/gray-logo.svg
diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
@@ -10,6 +10,8 @@ import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import Translate from '@docusaurus/Translate';
 import styles from './Footer.module.scss';
 
+import GrayLogo from '../../assets/gray-logo.svg';
+
 const Footer = () => {
   const {
     i18n: { currentLocale },
@@ -92,7 +94,9 @@ const Footer = () => {
     <section className={styles.FooterContainer} data-testid='footer-text'>
       <div className={styles.FooterBody}>
         <div className={styles.LogoWrapper}>
-          <img src='img/gray-logo.svg' alt='Deriv API Logo' className={styles.FooterLogo} />
+          <div className={styles.FooterLogo}>
+            <GrayLogo />
+          </div>
         </div>
         <div className={styles.FooterSection}>
           <section className={styles.Section1} data-testid='API-section'>