Merge pull request #128 from likhith-deriv/likhith/shaheer/COJ-506/in…

…tegrate-manual-upload-flow Likhith/shaheer/coj 506/integrate manual upload flow
shaheer-deriv · Feb 26, 2024 · 9ab087b · 9ab087b
2 parents 3c49222 + 07a3a6d
commit 9ab087b
Show file tree

Hide file tree

Showing 532 changed files with 9,398 additions and 5,707 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -44,9 +44,9 @@
 #  maryia-deriv
 #  matin-deriv
 #  nijil-deriv
-#  prince-deriv
 #  sandeep-deriv
 #  yashim-deriv
+#  wojciech-deriv
 
 ######################################################################################################
 #
@@ -94,9 +94,9 @@
 #  deriv-app/bot
 # ==============================================================
 
-/packages/bot-skeleton/**/*                                     @prince-deriv @sandeep-deriv @vinu-deriv
-/packages/bot-web-ui/**/*                                       @prince-deriv @sandeep-deriv @vinu-deriv
-/packages/indicators/**/*                                       @prince-deriv @sandeep-deriv @vinu-deriv
+/packages/bot-skeleton/**/*                                     @sandeep-deriv @vinu-deriv
+/packages/bot-web-ui/**/*                                       @sandeep-deriv @vinu-deriv
+/packages/indicators/**/*                                       @sandeep-deriv @vinu-deriv
 
 
 # ==============================================================
@@ -155,6 +155,13 @@
 /packages/trader/**/*                                           @matin-deriv @maryia-deriv
 
 
+# ==============================================================
+#  deriv-app/tradershub
+# ==============================================================
+
+/packages/tradershub/**/*                                       @matin-deriv @mahdiyeh-deriv @thisyahlen-deriv 
+
+
 # ==============================================================
 #  deriv-app/wallets
 # ==============================================================

diff --git a/.github/workflows/release_production.yml b/.github/workflows/release_production.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Download Remote Config Backup File
       uses: ./.github/actions/download_remote_config_backup
       with:
-        REMOTE_CONFIG_URL: ${{ env.REMOTE_CONFIG_URL }}
+        REMOTE_CONFIG_URL: ${{ vars.REMOTE_CONFIG_URL }}
     - name: Build
       uses: "./.github/actions/build"
       with:

diff --git a/.github/workflows/release_staging.yml b/.github/workflows/release_staging.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Download Remote Config Backup File
       uses: ./.github/actions/download_remote_config_backup
       with:
-        REMOTE_CONFIG_URL: ${{ env.REMOTE_CONFIG_URL }}
+        REMOTE_CONFIG_URL: ${{ vars.REMOTE_CONFIG_URL }}
     - name: Build
       uses: "./.github/actions/build"
       with:

diff --git a/.github/workflows/release_uat.yml b/.github/workflows/release_uat.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Download Remote Config Backup File
       uses: ./.github/actions/download_remote_config_backup
       with:
-        REMOTE_CONFIG_URL: ${{ env.REMOTE_CONFIG_URL }}
+        REMOTE_CONFIG_URL: ${{ vars.REMOTE_CONFIG_URL }}
     - name: Build
       uses: "./.github/actions/build"
       with:

diff --git a/__mocks__/globals.js b/__mocks__/globals.js
@@ -9,6 +9,14 @@ jest.mock('@deriv-com/analytics', () => ({
         pageView: jest.fn(),
         reset: jest.fn(),
         setAttributes: jest.fn(),
+        getFeatureValue: jest.fn(),
+        getInstances: jest.fn().mockReturnValue({
+            ab: {
+                GrowthBook: {
+                    setRenderer: jest.fn(),
+                },
+            },
+        }),
     },
 }));
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/account-v2/package.json b/packages/account-v2/package.json
@@ -11,7 +11,7 @@
         "start": "rimraf dist && npm run test && npm run serve"
     },
     "dependencies": {
-        "@deriv-com/ui": "1.8.1",
+        "@deriv-com/ui": "1.8.8",
         "@deriv/api": "^1.0.0",
         "@deriv/library": "^1.0.0",
         "@deriv/quill-design": "^1.3.2",

diff --git a/packages/account-v2/src/containers/ManualForm/__tests__/manual-form.spec.tsx b/packages/account-v2/src/containers/ManualForm/__tests__/manual-form.spec.tsx
@@ -52,7 +52,7 @@ describe('ManualForm', () => {
     it('should render the header texts correctly for the document NIMC slip', () => {
         const newProps = { ...mockProps, selectedDocument: MANUAL_DOCUMENT_TYPES.NIMC_SLIP };
         renderComponent(newProps);
-        expect(screen.getByText(/First, enter your NIMC slip number and the expiry date./)).toBeInTheDocument();
+        expect(screen.getByText(/First, enter your NIMC slip number./)).toBeInTheDocument();
         expect(
             screen.getByText(/Next, upload the page of your NIMC slip that contains your photo./)
         ).toBeInTheDocument();

diff --git a/packages/account-v2/src/containers/POAForm/DocumentSubmission/DocumentSubmission.tsx b/packages/account-v2/src/containers/POAForm/DocumentSubmission/DocumentSubmission.tsx
@@ -63,7 +63,7 @@ const DocumentSubmission: React.FC = () => {
                         descriptionSize='2xs'
                         fileFormats={['image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'application/pdf']}
                         hoverMessage='Upload your file here'
-                        icon={<StandaloneArrowUpFromBracketBoldIcon fill='#C7E5E5' iconSize='lg' />}
+                        icon={<StandaloneArrowUpFromBracketBoldIcon className='fill-solid-green-2' iconSize='lg' />}
                         maxSize={8388608}
                         name='document'
                         title='Drag and drop a file or click to browse your files.'

diff --git a/packages/account-v2/src/index.scss b/packages/account-v2/src/index.scss
@@ -2,10 +2,6 @@
 @tailwind components;
 @tailwind utilities;
 
-@import '@deriv/quill-design/dist/quill-design.css';
-@import '@deriv/quill-design/quill-tailwind/styles.css';
-@import '@deriv/quill-design/quill-tailwind/fonts.css';
-
 svg {
     display: inline;
     vertical-align: middle;

diff --git a/packages/account-v2/src/pages/ManualFormContainer/manual-form-container.tsx b/packages/account-v2/src/pages/ManualFormContainer/manual-form-container.tsx
@@ -59,11 +59,11 @@ export const ManualUploadContainer = ({ selectedDocument, setSelectedDocument }:
                 formData={formData}
                 isExpiryDateRequired={isExpiryDateRequired}
                 onCancel={() => {
-                    console.log('Called on Cancel');
+                    // TODO: Implement manual cancel
                     setSelectedDocument(null);
                 }}
                 onSubmit={values => {
-                    console.log('Called submit');
+                    // TODO: Implement manual submit
                     setFormData(prev => ({ ...prev, ...values }));
                     setShouldUploadSelfie(true);
                 }}
@@ -76,7 +76,7 @@ export const ManualUploadContainer = ({ selectedDocument, setSelectedDocument }:
             country='ng'
             isEnabledByDefault
             onOnfidoSubmit={() => {
-                console.log('Called Onfido submit');
+                // TODO: Implement onfido submit
             }}
             selectedDocument={selectedDocument as TManualDocumentTypes}
         />

diff --git a/packages/account-v2/tailwind.config.ts b/packages/account-v2/tailwind.config.ts
@@ -6,6 +6,43 @@ export default {
     presets: [QuillTailwindConfig],
     theme: {
         extend: {
+            borderRadius: {
+                none: '0',
+                xs: '4px',
+                sm: '6px',
+                default: '8px',
+                lg: '12px',
+                xl: '16px',
+                full: '50%',
+            },
+            borderWidth: {
+                0: '0',
+                1: '1px',
+                2: '2px',
+                3: '3px',
+                4: '4px',
+                5: '5px',
+                6: '6px',
+                7: '7px',
+                8: '8px',
+                9: '9px',
+                10: '10px',
+            },
+            fontSize: {
+                '2xs': '8px',
+                xs: '10px',
+                sm: '12px',
+                default: '14px',
+                lg: '16px',
+                xl: '18px',
+                '2xl': '20px',
+                '3xl': '22px',
+                '4xl': '24px',
+                '5xl': '26px',
+                '6xl': '28px',
+                '7xl': '30px',
+                '8xl': '32px',
+            },
             colors: {
                 solid: {
                     grey: {
@@ -25,8 +62,95 @@ export default {
                     },
                     green: {
                         '1': '#4bb4b3',
+                        '2': '#C7E5E5',
+                    },
+                },
+                status: {
+                    dark: {
+                        danger: '#cc2e3d',
+                        general: '#ffffff',
+                        information: '#377cfc',
+                        success: '#00a79e',
+                        warning: '#ffad3a',
+                    },
+                    light: {
+                        danger: '#ec3f3f',
+                        information: '#377cfc',
+                        success: '#4bb4b3',
+                        warning: '#ffad3a',
                     },
                 },
+                system: {
+                    dark: {
+                        'active-background': '#323738',
+                        'disabled-text': '#3e3e3e',
+                        'general-text': '#c2c2c2',
+                        'hover-background': '#242828',
+                        'less-prominent': '#6e6e6e',
+                        'less-prominent-text': '#6e6e6e',
+                        'primary-background': '#0e0e0e',
+                        'prominent-text': '#ffffff',
+                        'secondary-background': '#151717',
+                        'text-info-blue-background': '#182130',
+                    },
+                    light: {
+                        'active-background': '#d6dadb',
+                        'disabled-text': '#d6d6d6',
+                        'general-text': '#333333',
+                        'hover-background': '#e6e9e9',
+                        'less-prominent': '#999999',
+                        'less-prominent-text': '#999999',
+                        'primary-background': '#ffffff',
+                        'prominent-text': '#333333',
+                        'secondary-background': '#f2f3f4',
+                        'text-info-blue-background': '#dfeaff',
+                    },
+                },
+            },
+            screens: {
+                sm: { max: '600px' },
+                md: { min: '601px' },
+                lg: { min: '1280px' },
+                xl: { min: '1440px' },
+            },
+            spacing: {
+                0: '0px',
+                1: '1px',
+                2: '2px',
+                3: '3px',
+                4: '4px',
+                5: '5px',
+                6: '6px',
+                7: '7px',
+                8: '8px',
+                9: '9px',
+                10: '10px',
+                11: '11px',
+                12: '12px',
+                14: '14px',
+                16: '16px',
+                18: '18px',
+                20: '20px',
+                22: '22px',
+                24: '24px',
+                26: '26px',
+                28: '28px',
+                30: '30px',
+                32: '32px',
+                34: '34px',
+                36: '36px',
+                38: '38px',
+                40: '40px',
+                42: '42px',
+                44: '44px',
+                46: '46px',
+                48: '48px',
+                50: '50px',
+                52: '52px',
+                54: '54px',
+                56: '56px',
+                58: '58px',
+                60: '60px',
             },
         },
     },