From 93f4389bb039eb2cb8f526e3613222b3dcebb0a6 Mon Sep 17 00:00:00 2001 From: George Usynin <103181646+george-usynin-binary@users.noreply.github.com> Date: Tue, 16 Aug 2022 16:27:42 +0300 Subject: [PATCH] george / fix conflicts in pa-redesign branch (#6188) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Suisin/Update validation rules (#6145) * update letter symbol rules * new rulels * Update declarative-validation-rules.js * Suisin/Renew validation rules (#6147) * update letter symbol rules * new rulels * Updated Rules * edited rules * Update rules to accept multiple space * translations: 📚 sync translations with crowdin (#6158) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * remove personal-details-step-from-financial-svg (#6135) * TS migration of cashier UI components (#5947) * added ts related change required for migrating all components (#5760) * ts-migration-crypto-fiat-converter (#5796) * Trigger build * Update package-lock * ts-migration-cashier-notifications (#5765) * bahar/funds_protection_component-ts-migration (#5756) * funds_protection_component-ts-migration * remove_extra_type_file * fix_merge_issue * hamid/migrate-transfer-confirm-to-ts (#5815) * Migrate TransferConfirm to TS * Rename component in test file * Replace Confirm with TransferConfirm in PAs * Enhance Tests * ts-migration-page-404 (#5766) * Vinu/converted percentage-selector component into typescript (#5785) * converted percentage-selector component into typescript * changed the name of test_ids in percentage-selector spec file as per new guidlines * updated with latest upstream branch * added reactMouse event in props.types.ts * Vinu/migrated recent-transaction component to typescript (#5791) * migrated recent-transaction component to typescript * fixed Rootsore path in recent-transaction * tsconfig.json change in types path * ts-migration-verification-email (#5769) * bahar/Ts migration no balance (#5774) * ts-migration-no-balance * fix_merge_issue * Vinu/migrating cashier-container into ts (#5780) * migrting cashier-container into ts WIP * added type in virtual.tsx * changed test-ids in cashier-container * updated the branch with latest upstream branch * fixed Rootsore path in cashier-container * tsconfig.json change in types path * Vinu/Ts cashier error dialog (#5820) * migrated error-dialog to typescript * removed proptypes from error-dialog * added appropriate types to message variable in error-dialog * updated code with latest upstream branch * fixed type of rootstore in error-dialog * fixed Rootsore path in error dialog * added type for ReactElement in props.types.ts cashier * Vinu/migration of crypto-transaction-history component into typescript (#5834) * migration of crypto-transaction-history component into typescript * Trigger Build * Trigger Build * fixed Rootstore path in crypto-transactions-history * added type for crypto-transaction-details * added ReactMouseEvent in prop.types * added data-testid's in crypto-transaction-renderer component * Migrate CashierLocked to TS (#5959) * Fix security hotspot reported by sonarcloud Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com> Co-authored-by: Bahar Co-authored-by: Hamid * limit the number of chunks creating by webpack (#6040) * limit the number of chunks creating by webpack * webpack chunk strategy try 2 * webpack optmzn try 3 * add minchunks count as 30 * webpack max chunks set as 10 * chunk strategy maxchunks updated to 10 * webpack strat minsize rule * webpack strat update try 5 * webpack strat update try6 * Revert "MaryiaF/fix: P/L is not getting updated when a contract is terminated… (#6024)" (#6034) This reverts commit ba506880a588f34b911c9acf85829975b1c48f57. * translations: 📚 sync translations with crowdin (#6037) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * p2p/Floating rate feature (#5494) * Merge branch 'binary-com:master' into floating_rate (#5080) * Nijil / DBot - Add multipliers (#4172) * Retrigger vercel deployment * Init dbot multiplier * Fix es-lint issues * Add contract update dialog validations * logic added to hasAllRequiredBlocks for multipliers * Fix es-lint errors * Update stop loss block description and label * Filter out multipliers in quick-strategy * Fix incorrect rendering of duration/multiplier blocks on workspace when they're dragged out from toolbox * Fix typos * Add missing proptypes and other minor refactors * Fix minor issues + logic * Fix: trade option block not changing according to the selected trade type once it is dragged to workspace first and then plugged to the trade parameters block * Fix: Disable trade option block when plugged inside trade parameters * Remove connection to next statement in trade_defintion_restartonerror block * Make multiplier_stop_loss and multiplier_take_profit independant blocks + other UX improvement Description \n1.Make multiplier_stop_loss and multiplier_take_profit input field shadow blocks. \n2. Add check such that duplicate multiplier_take_profit and multiplier_stop_loss cannot be added to trade_definition_multiplier block. \n3.Show amount limits in trade_definition_multiplier block. * Cleanup workspace when switching between multiplier and other trade options * Remove extensice validation for multiplier_stop_loss block * Show dialog for multiplier contract on stop button click + minor cleanups * Update stop multiplier dialog content * Update stop multiplier dialog content and button actions * Minor bug fix * Fix stop multiplier dialog buttons styling * fix: multiplier contract not bought even after disabling TP/SL block inside multiiplier block * Disable stray blocks and their optional children recursively * fix: recover all pending transactions on page refresh or if client left page mid-contract * Restrict TP/SL blocks to multiplier block + add close button logic for dialog component * Fix profit not showing when it's zero * Add condition for restricted blocks to enable/disable stack option in context menu * Optimised proposal_open_contract call on mount of transaction tab * fix es-lint error * Update logic for recovering open contracts * Fix no-unused-vars error * Refactor code for readability * Refactor code for readability * Add logic to handle action of reset button in toolbar * Remove condition where it enabled the button in run panel while the contract is still closing * Fix default-case expected test error * Add note for multiplier block * Add condition to disable run panel button when multiplier contract is closing * Fix issue where connectWithContractUpdate tried to destructure undefined at first render * Add Learn more help content for multiplier trade option block * Minor change in toggle-card-dialog.jsx file * Refractored help-content from bot-skeleton to bot-web-ui package and updated help content for multiplier trade option block * Fix missing key prop error * Minor change in fix where connectWithContractUpdate tried to destructure undefined * Show banner for bot MF Real & VRTC Co-authored-by: Matin shafiei <70938039+matin-binary@users.noreply.github.com> Co-authored-by: Salar Hafezi Co-authored-by: Matin shafiei * Hirad/Cfd reset password modal js to ts (#4706) * Changed cfd-reset-password-modal container from js to ts * fix--Auto styling is done on the components * fix--Separated types from component * fix--Auto styling is done on the components * fix--Added a separate type for errors and Changed the type of current_list * Auto styling is done on the components * fix--Used Record utility type to improve readability * fix--Removed redundant imports and duplicate types * Pulled the latest changes from master * fix--Replaced ReactElement with ReactNode * Pulled from master * Made some changes to pass the tests * fix--Changed ReactNode to ReactElement to pass the tests * fix--Shortened one of the types * Fixed the conflicts Co-authored-by: Matin shafiei * Chore: Added NIN option in IDV dropdown for ng clients (#4970) * fix: payment info issue (#4978) Co-authored-by: Matin shafiei * Bala/Cleanup dashboard (#4967) * refactor: change folder name to appstore * chore: cleanup dashboard svgs * refactor: rename to appstore * remove separate build for dashboard * refactor: rename to appstore * cleanup build * remove appstore assets * fix: api-types auto generation * chore: cleanup dashboard * chore: cleanup appstore build * chore: fix appstore main file path * chore: use consistent configs * chore: refactor store usage to be consistent * chore: cleanup dist and routes * chore: remove old routes config * cleanup routes config * setup trading-hub path * cleanup asset_path * cleanup redirects * fix ts lint issues * fix lint issues * fix lint issue * fix test issues * update tsconfig path * update codeowners * chore: added a space * Update README.md Co-authored-by: Matin shafiei * Maryia/TrackJS_Avoiding_Pushwoosh_Failed_to_fetch_error (#4894) * Maryia/Checking network status before initializing Pushwoosh * Maryia/refactoring Co-authored-by: Matin shafiei * translations: 📚 sync translations with crowdin (#4987) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * salar / Hotfix/multiplier eu (#4989) * Add helper function for EU countries * Show digital options banner to VRTC-only EU clients * Add comment to remove duplicate code * Fix: apply more compliance conditions * Fix issue for EU residence * Apply prettier * Fix mobx issue for residence * Fix: prevent calls on undefined * Fix: check for blockly div first * Apply prettier * export_components_which_needed_to_be_used_in_app_store (#4972) * refactor_payment_agent_component_for_app_store (#4968) * translations: 📚 sync translations with crowdin (#5005) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * refactor: investor password (#4992) * Nuri/Refactor: Refactor compare account (#4969) * refactor compare account * retrigger circleci * retrigger deployment * removed unused text * likhith/OrderConfirmCompleted error status displayed on slow n/w (#4832) * Resolved: #56123 - OrderConfirmCompleted error status displayed on slow n/w * Refactored code * Fixed lint errors * implemented review comment * Resolved eslint issues * Resolved Console.log error * Added comments to changes * Resolved lint errors * Removed unwanted component * fix storybook build (#4997) * MaryiaF/fix: TrackJS error - i.resetVirtualBalance is not a function (#4892) * MaryiaF/fix: TrackJS error - i.resetVirtualBalance is not a function * MaryiaF/fix: TrackJS error - i.resetVirtualBalance is not a function * Maryia/Fix for styles of POI & POA steps in Settings and CFD modals (#4761) * Maryia/fixed styles of poa upload block * Maryia/fixed cfd poa modal for responsive mode * Maryia/fix for POI step style in CFD modal * Maryia/fixed style of upload criteria in CFD modal POA step * Maryia/refactoring as per deriv app code standard * Maryia/replaced px with rem * Maryia/fix for the upload box style requiring nesting inside list * Maryia/fixed POI styles * Hirad/Cfd dashboard container JS to TS (#4941) * Changed cfd-dashboard container from javascript to typescript * fix--Fixed the default export of the cfd-dashboard * Pulled from master * fix--Invisible tab menu should be fixed * Auto styling is done * IDV notification changes and refactoring (#5001) * Akmal / Add trustpilot notification (#4974) * Add trustpilot notification * Fix formatting * Add undefined check * Vijayasree/Manage Account modal from Cashier Onboarding links are broken on iphoneSE (#4948) * Manage Account modal from Cashier Onboarding links are broken on iphone SE * Manage Account modal from Cashier Onboarding links are broken on iphone SE * Manage Account modal from Cashier Onboarding links are broken on iphoneSE * Update account-wizard.scss Co-authored-by: Matin shafiei * likhith/Added jest config and test cases for App-Content component (#4876) * Added jest config and test cases for App-Content component * Added test cases for App Content component * Fixed lint errors * Removed lint errors and configured webpack * Reordered webpack extension array * Implemented review comments * implemented review comments * george / added test for "PaymentAgentList" component (#4825) * added test for "PaymentAgentList" component * fixed a spelling error * refactored code, changed query method * code refactoring * george / added tests for OnRampProviderCard (#4880) * added tests for OnRampProviderCard * code refactoring (add data-testid into Icon component) * naming refactoring data-testid * naming refactoring * add new prop (data_testid) to Icon component * code refactoring using icon prop data_testid * add prop types for data_testid * likhith/Removed unused functions from Cashier container and added test cases (#4821) * likhith/added testcases to cashier-container * added loader check test case * Variable change * Fixed variable scoping * Refactored code inline with naming conventions * Removed code smells * Improved code visibility * Removed unused functionality in CashierComponent * Removed unused imports * Removed unused property and improved test cases * modified input data * Incorporated review comments * Incorporated review comments * Added test cases to order and order-table (#4916) * fix test cases because of refactoring the component (#5029) * Nijil/Pass correct value to SelectNative value prop from PA dropdown (#5034) * fix: pass correct value to SelectNative value prop * minor refactor * translations: 📚 sync translations with crowdin (#5039) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * MaryiaF/fix: bold the menu option when the user has gone by the child… (#4965) * MaryiaF/fix: bold the menu option when the user has gone by the child menu items and then navigated one of them to the corresponding page * MaryiaF/refactor: solution with switching to the bold menu item * MaryiaF/chore: revert intent * MaryiaF/refactor: use Text component instead of spane in toggle-menu-drawer file * MaryiaF/refactor: remove unuseful style and change import * Merge branch 'master' of github.com:binary-com/deriv-app into 57685_2 * MaryiaF/fix: all the sub menus are not supposed to be in bold in first visit, 1 of the sub menu should be bold during the visit * MaryiaF/fix: condition when the menu item should be bold * MaryiaF/fix: remove console.log * Revert "Merge branch 'master' of github.com:binary-com/deriv-app into 57685_2" This reverts commit 2c19bed858d09d2dee7b4ffb939f80617a91972e. Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> * test coverage (#4900) Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> * Artsem / test coverage (#4890) * test coverage * remove redundant import * fix testid naming * fix testid and elements naming * remove redundant mockProps() Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> * Amina/test_coverage_for_poi-verified_component_in_account_package (#5006) * poi-verified-spec * poi-verified-spec Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> * Amina/test_coverage_for_poa_unverified_component_in_account_package (#4993) * unverified-spec * poa-unverified Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> * Amina/test coverage for poa-submitted (#4990) * test_coverage_for_poa_submitted * fix Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> * george / test coverage for "recent transaction" component (#4838) * added tests for RecentTransaction component * fixed condition for cashier transaction icon * removed code duplication * refactored code * code refactoring (add data-testid into Item component) * code refactoring * naming refactoring data-testid * naming refactoring * add new prop (data_testid) to Icon component * code refactoring using icon prop data_testid * add prop types for data_testid Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> * translations: 📚 sync translations with crowdin (#5048) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * update branch with master (#5010) * Maryia/Set notifications together with each handling of notifications (#4958) * Maryia/Set notifications before each handling of notifications * Maryia/style fix to fit in long FR, ES & PT text on the notification button * Fix design for DMT5 investor password reset modal (#4942) * Ako/ Codecov integration (#5053) * build/ add test:ci script to run tests in the ci with different config * ci/ add codecov github action * ci/ workflow update * ci/ update coverage path * ci/ get coverage over all of the files * ci/ get coverage on pull request * Revert "build/ add test:ci script to run tests in the ci with different config" This reverts commit 2771958602f5af3048c334e28868d05f9ff4f6cd. * doc/ add codecov badge to readme file * Vijayasree/Crypto icon in withdrawal page is not shown for specific device IOS (#4976) * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * re-trigger build * re-trigger build * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Crypto icon in withdrawal page is not shown for specific device IOS * Sara / Fixed issue with error handling (#4966) * Fixed issue with error handling * Removed extra code * fixed issue with aggregation methods * MaryiaF/chore: remove consoles (#5059) * Matin/Add: TS files for translation extraction (#5073) * remove appstore package from translations (#5075) Co-authored-by: Matin shafiei <70938039+matin-binary@users.noreply.github.com> Co-authored-by: Salar Hafezi Co-authored-by: Matin shafiei Co-authored-by: hirad-rewok <91878582+hirad-rewok@users.noreply.github.com> Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com> Co-authored-by: Maryia <87321516+maryia-deriv@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> Co-authored-by: Salar Hafezi <76559464+salarhfz-fs@users.noreply.github.com> Co-authored-by: Bahar Co-authored-by: njazuli-deriv <78890281+njazuli-deriv@users.noreply.github.com> Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com> Co-authored-by: Maryia Frantsava <88426229+maryiafrantsava-deriv@users.noreply.github.com> Co-authored-by: Akmal Djumakhodjaev Co-authored-by: vijayasree-deriv <98810931+vijayasree-deriv@users.noreply.github.com> Co-authored-by: george-usynin-deriv <89790856+george-usynin-deriv@users.noreply.github.com> Co-authored-by: Artsem Kavaleu <88381164+artsemkavaleu-deriv@users.noreply.github.com> Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> Co-authored-by: mitra-fs <64970259+mitra-fs@users.noreply.github.com> Co-authored-by: Ali(Ako) Hosseini Co-authored-by: sara-fs <55442058+sara-fs@users.noreply.github.com> Co-authored-by: Matin shafiei * Revert "Merge branch 'binary-com:master' into floating_rate (#5080)" (#5081) This reverts commit 725636b267eb434a278976b67c3461ccc2130338. * Artsem / Floating rate banner and warning for existing ads (#4975) * Add floating rate enable banner and warning icon * remove extra function call * remove deprecated conditions * remove conditional render, add todo comment * fix Localize settings * likhith/Created Floating rate custom component (#4971) * Created Floating rate custom component * Removed hardcoded values * Incorporated review comments * Reordered functions as per style guide * Replaced Css units * Incorporated review comments * Empty commit * Minor bug fix * Renamed functions appropriately * Incorporated review comments * Fetching floating rate status from const * Resolved lint errors * Incorporated review comments * incoeporated review comments * Added syles as per UX * Added a comment to explian props * Changed CSS as per BEM standard * Changes naming conventions * Implemented review comments * Refactored code as per comments * Fixed eslint errors * Reverted the changes made * Minor bug fixes * Added currecnt_focus prop * likhith/create floating-rate ad (#4964) * Floating-rate Ui created * Added validations to floating-rate component * Implemented Floating rate component * Added default values for floating rates based on ad type * fixed lint issues * Minor bug fixes * Added store subscriptions * Enhanced InputField component and added floating rate store * Resolved lint errors * Added changes for My Ad screen * Added floate-rate * Added exisiting user update * Added reaction to my-ad store * Edit form * Added edit ad section * Added switch rate modal * Added switch ad dialog * Added banner condition * Added banner condition * Empty commit * Minor bug fixes * Minor bug fixes * removed console logs * Incorporated API changes * Incorporated review comments * Removed duplication * Integrated API with create floting rate ad * Incorporated review comments * Added floating rate error messages * Resolved lint error * Added styling as per UX * Minor bug fix in create ad form * Changes CSS as per BEM * Resolved lint error * Added current_focus to input field * Minor bug fixes for Create ad * Incorporated review comments * Minor bug fix * Removed empty structure * Removed additional switch state * Fixed issue with date banner * Added test cases for Floating rate component * Removed the empty element and replaced with null * Incorporated the changes * fixed incorrect file name * Trigger Build * Added as per naming * Removed localize of 1 * Added review comments * Incorporated changes * Replaced string with constant * Incorporated review comments * Removed un-necessary div * Removed css * Renamed function * Minor bug fixes and incorporated comments * Added fallback * alphabetize observables * Replaced CSS for Ad status * Resoled CSS and functionality bugs * Fixed lint errors * Resolved lint erros * Incorporated review comments * Reduced spacing between the banner * Formatted user input * Fixed failing test case * Added comments to explain functionality * Fetching date and time from server * Renamed function * Refactored code * Added review comments * Resolved decimal round off issue * Fixed Rounding off of decimal digits * Regex change in psoitive integer check * Resolved issue with round off to decimal point * Re-arranged imports * Fixed the testcase * Fixed floating_rate input check * Removed Math.sign * Reverted decimal change * Implemented round of logic for decimal places * refactor: Renamed variables * fix: Round off issue in Create Ad summary * fix: resolved decimal point to 2 digits * Resolved lint errors * fix: Renamed the function * chore: Ad display table rate will be calculated from * fix: test color in dark theme * fix: label changes b/w fixed and floating * fix: invoking api call to fetch the changes * fix: rate synced b/w myads and buy/sell * fix: range offset validation * fix: modified rate property in edit ads * fix: Float rate input suffix * fix: code formatted * fix: setting floating rate to 2 decimals on blur * fix: spacing issue with floating rate input * Trigger build * Trigger build * fix: removed unwanted padding * fix: added ellipse to fix over lapping * fix: removed disabling of floating rate field buttons * fix: resolved issue with error message * fix: Overlapping CSS issues in Mobile * fix: added missing background color for dark theme * fix: removed button highlight in mobile * fix: button higlight issue * fix: display of cursor pointer on scroll * fix: resolved issue with message * fix: Ad change warning message * fix: color for dark mode Co-authored-by: Likhith Kolayari * fix: conflict message not updated * likhith/created edit my ad screen (#4988) * Floating-rate Ui created * Added validations to floating-rate component * Implemented Floating rate component * Added default values for floating rates based on ad type * fixed lint issues * Minor bug fixes * Added store subscriptions * Enhanced InputField component and added floating rate store * Resolved lint errors * Added changes for My Ad screen * Added floate-rate * Added exisiting user update * Added reaction to my-ad store * Edit form * Added edit ad section * Added switch rate modal * Added switch ad dialog * Added banner condition * Added banner condition * Empty commit * Implemented edit ads for floating rates * Inorporated review comment * minor bug fixes * Minor bug fixes * Minor bug fixes * removed console logs * Added rae_type prop * Incorporated API changes * Incorporated API changes * Incorporated review comments * Removed duplication * Integrated API with create floting rate ad * Incorporated review comments * Added floating rate error messages * Resolved lint error * Added styling as per UX * Added styles as per UX * Refactoring code * Css changes to summary component * Trigger Build * Minor bug fix in Create Ad form * Minor bug fix in create ad form * Changes CSS as per BEM * Resolved lint error * Added current_focus to input field * Minor bug fixes for Create ad * Incorporated review comments * Minor bug fix * Removed empty structure * Removed additional switch state * Fixed issue with date banner * Added test cases for Floating rate component * Removed the empty element and replaced with null * Incorporated the changes * fixed incorrect file name * Trigger Build * Added as per naming * Removed localize of 1 * Added review comments * Incorporated changes * Replaced string with constant * Incorporated review comments * Removed un-necessary div * Removed css * Renamed function * Minor bug fixes and incorporated comments * Added fallback * alphabetize observables * Replaced CSS for Ad status * Migrated create ad comments to Edit ad * Resolved lint errors * Fixed lint issues * Resoled CSS and functionality bugs * Fixed lint errors * Resolved lint erros * Incorporated review comments * Reduced spacing between the banner * Formatted user input * Fixed failing test case * Added comments to explain functionality * Fetching date and time from server * Renamed function * Refactored code * Added review comments * Resolved decimal round off issue * Fixed Rounding off of decimal digits * Added test case for create ad * Regex change in psoitive integer check * Added test case to test form values * Resolved decimal round off issue * Added test acss to edit form * Resolved lint errors * Resolved issue with round off to decimal point * Re-arranged imports * Fixed the testcase * Removed unused imports * Fixed floating_rate input check * Removed Math.sign * Reverted decimal change * Implemented round of logic for decimal places * refactor: Renamed variables * refactor: Added fallback condition * fix: added a exchange rate fallback condition * fix: Round off issue in Create Ad summary * fix: resolved decimal point to 2 digits * Resolved lint errors * fix: Renamed the function * chore: Ad display table rate will be calculated from * fix: test color in dark theme * fix: label changes b/w fixed and floating * fix: invoking api call to fetch the changes * fix: rate synced b/w myads and buy/sell * fix: range offset validation * fix: modified rate property in edit ads * fix: Float rate input suffix * fix: code formatted * fix: setting floating rate to 2 decimals on blur * fix: spacing issue with floating rate input * Trigger build * Trigger build * fix: removed unwanted padding * fix: added ellipse to fix over lapping * incorporated changes * fix: removed disabling of floating rate field buttons * fix: resolved issue with error message * fix: Overlapping CSS issues in Mobile * fix: added missing background color for dark theme * fix: removed button highlight in mobile * fix: button higlight issue * fix: display of cursor pointer on scroll * fix: resolved issue with message * fix: modified display of summary in edit ad component * fix: removed spec code * fix: Removed test cases * chore: reverted old commit * feat: Added banner for switch rate * fix: Error message text * fix: incorporated review comments * fix: removed unwanted store condition and added subscription to exchange rates * fix: removed incorrect function call * fix: added a null check * fix: refactored code * ref: Added comments * ref: Refactored code for performance * ref: refactored code * ref: code refactor * ref: Incorporated review comments * Trigger Build * fix: removed fixed size * fix: resolved conflict * fix: moved functionality from component to store * fix: removed unnecessary commenting * ref: renamed cancel action functions * ref: refactored code for increated readability * feat: implemented a function for removing trailing zeros * ref: refactored the code in edit ad summary * fix: reverted decimal round off rules * fix: resolved issue with resetting selected Ad id * fix: switching ad types in edit * fix: issue with edit ad switch * fix: display rate change dialog even when ads are deactivated * fix: disabled activate ad when past date is passed * fix: displaying error message based on the required ad type * fix: banner glitch occurs when data loaded in chunks * fix: enable ads after switch update * fix: Form should not be checked for value change when ad switch is triggered * fix: test to incorporate sign * fix: implemented dynamic type for field in mobile * fix: added css to fix disable styling * fix: enforcing disable bg color for popover * fix: responsive view of switch ad modal * fix: added missing theme color for dark mode * fix: banner width consistancy * fix: incorporated touched state for Payment method Co-authored-by: Likhith Kolayari * likhith/Feature buy sell confirmation (#5487) * Floating-rate Ui created * Added validations to floating-rate component * Implemented Floating rate component * Added default values for floating rates based on ad type * fixed lint issues * Minor bug fixes * Added store subscriptions * Enhanced InputField component and added floating rate store * Resolved lint errors * Added changes for My Ad screen * Added floate-rate * Added exisiting user update * Added reaction to my-ad store * Edit form * Added edit ad section * Added switch rate modal * Added switch ad dialog * Added banner condition * Added banner condition * Empty commit * Minor bug fixes * Minor bug fixes * removed console logs * Incorporated API changes * Incorporated review comments * Removed duplication * Integrated API with create floting rate ad * Incorporated review comments * Added floating rate error messages * Resolved lint error * Added styling as per UX * Minor bug fix in create ad form * Changes CSS as per BEM * Resolved lint error * Added current_focus to input field * Minor bug fixes for Create ad * Incorporated review comments * Minor bug fix * Removed empty structure * Removed additional switch state * Fixed issue with date banner * Added test cases for Floating rate component * Removed the empty element and replaced with null * Incorporated the changes * fixed incorrect file name * Trigger Build * Added as per naming * Removed localize of 1 * Added review comments * Incorporated changes * Replaced string with constant * Incorporated review comments * Removed un-necessary div * Removed css * Renamed function * Minor bug fixes and incorporated comments * Added fallback * alphabetize observables * Replaced CSS for Ad status * Resoled CSS and functionality bugs * Fixed lint errors * Resolved lint erros * Incorporated review comments * Reduced spacing between the banner * Formatted user input * Fixed failing test case * Added comments to explain functionality * Fetching date and time from server * Renamed function * Refactored code * Added review comments * Resolved decimal round off issue * Fixed Rounding off of decimal digits * Regex change in psoitive integer check * Resolved issue with round off to decimal point * Re-arranged imports * Fixed the testcase * Fixed floating_rate input check * Removed Math.sign * Reverted decimal change * Implemented round of logic for decimal places * refactor: Renamed variables * fix: Round off issue in Create Ad summary * fix: resolved decimal point to 2 digits * Resolved lint errors * fix: Renamed the function * chore: Ad display table rate will be calculated from * fix: test color in dark theme * fix: label changes b/w fixed and floating * fix: invoking api call to fetch the changes * fix: rate synced b/w myads and buy/sell * fix: range offset validation * fix: modified rate property in edit ads * fix: Float rate input suffix * fix: code formatted * fix: setting floating rate to 2 decimals on blur * fix: spacing issue with floating rate input * Trigger build * Trigger build * fix: removed unwanted padding * fix: added ellipse to fix over lapping * fix: removed disabling of floating rate field buttons * fix: resolved issue with error message * feat: Implemented floating rate for buy/sell * fix: Overlapping CSS issues in Mobile * fix: added missing background color for dark theme * fix: removed button highlight in mobile * fix: button higlight issue * fix: display of cursor pointer on scroll * fix: resolved issue with message * fix: color for dark mode * fix: buy/sell modal styling * fix: render data in accordian * feat: incorporated expand all accordian * feat: Implemented Expand & Collapse all feature * ref: code refactor * fix: removed console errors * fix: removed unused prop * fix: incorporated review comments * fix: incorporated review comments * fix: incorporated Expamd all button * fix: incorrect prop name in accordion component * fix: incorporated review comments * ref: Removed code duplication * ref: refactored the code * fix: changes px to rem * fix: incorporated rate change error dialog * fix: removed unwanted CSS * fix: renamed porptype in Rate Change modal * ref: code refactored * ref: rate change modal code refactored * ref: Refactored code * fix: css issues related to buy-sell dialog * fix: fixed failing test cases * fix: Added a error code check to display appropriate popups * fix: CSS inssues in Buy-sell modal * fix: css issue of error hintbox * fix: resolved issue with rounding digit in receive amount * fix: blocking order creation when balance is low * fix: css changes to fix disabling form * fix: modal condition to display low balance * fix: blocking user from entering value more than balance * fix: display Form error messages in footer and account balance error in banner * fix: resolved lint errors * ref: changed the TODO comment * ref: fixed the comment * fix: incorporated subscribeWS method * fix: resolved failing testcase issue * fix: removed commented code * fix: display of incorrect efective rate * fix: decimal round off * fix: navigation to buy/sell table when try again is clicked * fix: buy/sell order dialog title to match the design * fix: css issues in buy/sell * fix: design mismatch in order confiormation dialog * ref: Refactored code to reuse functionality * fix: removed commented code * fix: market change update in Advertiser section * fix: re-render on balance change * fix: disabling fields when balance is low * fix: expand/collapse issue * fix: resolved issue with expand and collapse * fix: restricted rate input to 8 characters * fix: resolved console error * fix: file name * fix: fixed failing test case * fix: added order input check against account balance * fix: css issues in add payment method in buy-sell form * fix: validation of sell order * fix: currency format of balance * fix: re-establish n/w connection on reload * ref: Incorporated safety null check * fix: moved low balance banner display to be handled by state Co-authored-by: Likhith Kolayari * farrah/ removed payment method banner in p2p (#5755) * removed transaction time and payment method banners * removed setting of missing payment methods * reverted removal of reduced transaction time banner * likhith/incorporated market rate calculation with 6 decimals (#5770) * feat: incorporated market rate calculation with 6 decimals * ref: refactored code to generate effective rate * ref: removed commented code * fix: round off decimal calculation of effective market rate * fix: formatting decimals in effective rate * fix: set the form to be dirty when PM is selected * fix: checking for change when PM methods are modified * fix: enable button for edit ad * fix: enabling submit method for buy ads * fix: decimal round off issue in buy-sell * fix: display min of 2 decimal points * fix: displying initial value of buy-sell ad * Trigger build * fix: removed unnecessary spacing * Trigger build * fix: effective rate round off in Buy/sell * Trigger build * fix: setting correct ad type * fix: display order rate amount * fix: removed formatted text usage * fix: removed incorrect round off * fix: sunc effective_rate calculation b/w FE & BE (#5910) * fixed order table row spacing (#5900) * fixed post ad button (#5912) * farrah/ update received amount if rate has changed (#5911) * fixed received amount when rate has changed * refactor code * formatted received amount (#5913) * farrah/ fixed input amount validation on buy/sell form (#5928) * fixed input amount validation * refactor code * disabled edit button for temporary banned users (#5926) * Remove duplicate setRemount entry * farrah/ fixed overlapping status in order page (#5950) * fixed overlapping status in order page * refactor code * farrah/ fixed buy and sell form spacing (#5899) * fixed buy and sell form spacing * fixed banner spacing * fixed banner spacing in mobile * fixed spacing on responsive Co-authored-by: Matin shafiei <70938039+matin-binary@users.noreply.github.com> Co-authored-by: Salar Hafezi Co-authored-by: Matin shafiei Co-authored-by: hirad-rewok <91878582+hirad-rewok@users.noreply.github.com> Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com> Co-authored-by: Maryia <87321516+maryia-deriv@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> Co-authored-by: Salar Hafezi <76559464+salarhfz-fs@users.noreply.github.com> Co-authored-by: Bahar Co-authored-by: njazuli-deriv <78890281+njazuli-deriv@users.noreply.github.com> Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com> Co-authored-by: Maryia Frantsava <88426229+maryiafrantsava-deriv@users.noreply.github.com> Co-authored-by: Akmal Djumakhodjaev Co-authored-by: vijayasree-deriv <98810931+vijayasree-deriv@users.noreply.github.com> Co-authored-by: george-usynin-deriv <89790856+george-usynin-deriv@users.noreply.github.com> Co-authored-by: Artsem Kavaleu <88381164+artsemkavaleu-deriv@users.noreply.github.com> Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> Co-authored-by: mitra-fs <64970259+mitra-fs@users.noreply.github.com> Co-authored-by: Ali(Ako) Hosseini Co-authored-by: sara-fs <55442058+sara-fs@users.noreply.github.com> Co-authored-by: Matin shafiei Co-authored-by: Likhith Kolayari Co-authored-by: Farrah Mae Ochoa <82315152+farrah-deriv@users.noreply.github.com> * translations: 📚 sync translations with crowdin (#6041) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * add minchunks count as 30 * webpack max chunks set as 10 * chunk strategy maxchunks updated to 10 * fixed exchange rate subscription error (#6046) * reverted commit * webpack start try7 * farrah/ fixed sell form validation (#6047) * fixed sell form validation * fixed buy/sell form validations * reset amount with empty field * maxchunks to 25 * webpack strategy update * webpack strategy update minSizeReduction * webpack chunk strategy optimization * re arrange and update configs Co-authored-by: ashrafali-v Co-authored-by: Farrah Mae Ochoa <82315152+farrah-deriv@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> Co-authored-by: Nijil Nirmal <62882794+nijil-binary@users.noreply.github.com> Co-authored-by: Matin shafiei <70938039+matin-binary@users.noreply.github.com> Co-authored-by: Salar Hafezi Co-authored-by: Matin shafiei Co-authored-by: hirad-rewok <91878582+hirad-rewok@users.noreply.github.com> Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com> Co-authored-by: Maryia <87321516+maryia-deriv@users.noreply.github.com> Co-authored-by: Salar Hafezi <76559464+salarhfz-fs@users.noreply.github.com> Co-authored-by: Bahar Co-authored-by: njazuli-deriv <78890281+njazuli-deriv@users.noreply.github.com> Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com> Co-authored-by: Maryia Frantsava <88426229+maryiafrantsava-deriv@users.noreply.github.com> Co-authored-by: Akmal Djumakhodjaev Co-authored-by: vijayasree-deriv <98810931+vijayasree-deriv@users.noreply.github.com> Co-authored-by: george-usynin-deriv <89790856+george-usynin-deriv@users.noreply.github.com> Co-authored-by: Artsem Kavaleu <88381164+artsemkavaleu-deriv@users.noreply.github.com> Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> Co-authored-by: mitra-fs <64970259+mitra-fs@users.noreply.github.com> Co-authored-by: Ali(Ako) Hosseini Co-authored-by: sara-fs <55442058+sara-fs@users.noreply.github.com> Co-authored-by: Matin shafiei Co-authored-by: Likhith Kolayari * MaryiaF/refactor: convert summary-card to ts (#6001) * MaryiaF/refactor: convert summary-card to ts * MaryiaF/refactor: contract-card-loading * MaryiaF/refactor: summary-card * MaryiaF/refactor: SummaryCard Co-authored-by: Yashim Wong * fix(cashier): avoid screen blinking of restricted pages during the first download (#6039) * try submitting an id document instead message removed (#5968) Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”> * likith/testing functionality of reset trading password modal (#5823) * feat: test cases on reset-trading password-modal * feat: Added test acses for reset Password modal * fix: renamed data-testid as per guide * fix: created a reusable function containing interaction block * feat: added test case to check navigation reroute * ref: refactored code * ref: renamed the testid * Vinu/Service worker caching (#5887) * service-worker-precaching in progress * added images in runtime caching * added core js file to runtime caching * number of images to be kept at runtime caching kept at 15 * adjusted path for runtimecaching * added html files to caching * removed all files from precaching other than css * fixed pathnames in config.js * added path to cache js-core file * implemented review comments for runtime caching * implementation on review comments in progress * added smartchart-files to precaching * Vinu/Test coverage sent email modal (#5463) * added test coverage for sent-email-modal * fixed linting issue in sent-email-modal * props change in sent-email-modal.spec * fixed linting issue in sent-email-modal.spec * rearragned the order of imports in sent-email-modal.spec * Trigger Build * Trigger Build * implemented review comments in sent-email-modal-spec file * fixed linting issue in sent-email-modal * implemented review comments for sent email modal test coverage * adjusted the sent-email-modal spec file as per new guidlines * implemented review comments in sent-email-modal spec.js file * gave appropriate name to data-testid in sent-email-modal * thisyahlen/ added icon for tether trc20 (#6060) * added icon for tether trc20 * icons revert * fix for test cases * changed tooltip for all the tether coins * fixed the deposit page error and the tusdt lowercase * translations: 📚 sync translations with crowdin (#6174) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> * refactor(confirm component): refactor confirm component, fix tests * Hirad/ Finished MF urgent changes (#6159) * Finished MF urgent changes * Changed the styling of the condition * Jim / Publisher documentation (#6002) * docs: update README.md in publisher * docs: update README.md in publisher * docs: update README.md in publisher * Jim / Components documentation (#6008) * docs: update README.md, add description for valid script and replace lerna bootstrap * docs: remove empty docs * docs: update README.md * docs: update README * chore: fix end of note in README * docs: change note in components README.md * move PositionsDrawerCard from reports to components (#6049) * yauheni/#69488 changing language for closed market redirecting fix (#5999) * yauheni/#69488 changing language for closed market redirecting fix * func name fix * proptypes fix * interval delete fix, is_lang_change moved * store fix for language changing * several attempts of changing fix * closed word translation fix * logout active symbols loading fix * logout redirection to default markets fix Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”> * Hirad/ Fixed the issue where landing company was shown for eu users who have… (#6078) * Fixed the issue where landing company was shown for eu users who have just financial options * Changed the naming convention of one_or_two_cards variable * made some changes to the naming according to the suggestions * Pulled from master Co-authored-by: Matin shafiei * Ameerul /Bug 64559 delete pm name handle for long value (#6107) * changed the margin-top for mobile view for buy-sell * merging upstream master * changed the payment methods list modal and wrapped the text for long bank names * hamid/overwrite-overflow-of-app-contents-in-cashier (#5915) * Overwrite overflow of app contents in cashier) * Update packages/cashier/src/containers/cashier/cashier.scss Co-authored-by: Nijil Nirmal <62882794+nijil-binary@users.noreply.github.com> * Update branch and Enhance style Co-authored-by: Nijil Nirmal <62882794+nijil-binary@users.noreply.github.com> * george / rm70573 / payment agent error visibility (#6023) * fix: pa error visibility * fix failed test * yauheni/70841 trackJS setUserId should be string (#6139) Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”> * Hirad/ Account switcher demo total asset change (#5622) * Account switcher total asset is shown correctly * Changed currency that is shown * fix--api call is put in useEffect now * Made the condition shorter * Removed the redundant parameter in the exchange_rates call * Pulled from master * Pulled from master * Added currency exchange to real account tab of account switcher * translations: 📚 sync translations with crowdin (#6199) Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> Co-authored-by: suisin-deriv <103026762+suisin-deriv@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com> Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com> Co-authored-by: Nijil Nirmal <62882794+nijil-binary@users.noreply.github.com> Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com> Co-authored-by: Bahar Co-authored-by: Hamid Co-authored-by: ashraf-deriv <97999159+ashraf-deriv@users.noreply.github.com> Co-authored-by: ashrafali-v Co-authored-by: Farrah Mae Ochoa <82315152+farrah-deriv@users.noreply.github.com> Co-authored-by: Matin shafiei <70938039+matin-binary@users.noreply.github.com> Co-authored-by: Salar Hafezi Co-authored-by: Matin shafiei Co-authored-by: hirad-rewok <91878582+hirad-rewok@users.noreply.github.com> Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com> Co-authored-by: Maryia <87321516+maryia-deriv@users.noreply.github.com> Co-authored-by: Salar Hafezi <76559464+salarhfz-fs@users.noreply.github.com> Co-authored-by: njazuli-deriv <78890281+njazuli-deriv@users.noreply.github.com> Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com> Co-authored-by: Maryia Frantsava <88426229+maryiafrantsava-deriv@users.noreply.github.com> Co-authored-by: Akmal Djumakhodjaev Co-authored-by: vijayasree-deriv <98810931+vijayasree-deriv@users.noreply.github.com> Co-authored-by: george-usynin-deriv <89790856+george-usynin-deriv@users.noreply.github.com> Co-authored-by: Artsem Kavaleu <88381164+artsemkavaleu-deriv@users.noreply.github.com> Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com> Co-authored-by: mitra-fs <64970259+mitra-fs@users.noreply.github.com> Co-authored-by: Ali(Ako) Hosseini Co-authored-by: sara-fs <55442058+sara-fs@users.noreply.github.com> Co-authored-by: Matin shafiei Co-authored-by: Likhith Kolayari Co-authored-by: maryiafrantsava-binary <103181650+maryiafrantsava-binary@users.noreply.github.com> Co-authored-by: Yashim Wong Co-authored-by: yauheni-kryzhyk-deriv <103182683+yauheni-kryzhyk-deriv@users.noreply.github.com> Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”> Co-authored-by: thisyahlen <104053934+thisyahlen-deriv@users.noreply.github.com> Co-authored-by: jim-deriv <104334373+jim-deriv@users.noreply.github.com> Co-authored-by: mahdiyeh-fs <82078941+mahdiyeh-fs@users.noreply.github.com> Co-authored-by: ameerul-deriv <103412909+ameerul-deriv@users.noreply.github.com> --- jest.config.base.js | 2 +- package.json | 1 + .../__tests__/radio-button.spec.js | 5 +- .../currency-selector/radio-button.jsx | 12 +- .../__tests__/poi-country-selector.spec.js | 18 +- .../poi-country-selector.jsx | 6 - .../reset-trading-password-modal.spec.js | 201 + .../__tests__/sent-email-modal.spec.js | 158 + .../sent-email-modal/sent-email-modal.jsx | 6 +- .../proof-of-identity-container.jsx | 2 - .../proof-of-identity-submission.jsx | 3 - .../contract-card-loading.tsx | 8 +- .../{summary-card.jsx => summary-card.tsx} | 24 +- .../components/summary/summary-card.types.ts | 75 + packages/cashier/babel.config.json | 2 +- packages/cashier/build/constants.js | 1 + packages/cashier/package-lock.json | 17703 ++++++++++++++++ packages/cashier/package.json | 1 + .../cashier-container/{index.js => index.ts} | 0 .../__tests__/{real.spec.js => real.spec.tsx} | 16 +- .../cashier-container/real/index.js | 3 - .../cashier-container/real/index.ts | 3 + .../real/{real.jsx => real.tsx} | 19 +- .../{virtual.spec.js => virtual.spec.tsx} | 12 +- .../cashier-container/virtual/index.js | 3 - .../cashier-container/virtual/index.ts | 3 + .../virtual/{virtual.jsx => virtual.tsx} | 23 +- ...locked.spec.js => cashier-locked.spec.tsx} | 4 +- ...{cashier-locked.jsx => cashier-locked.tsx} | 58 +- .../src/components/cashier-locked/index.js | 3 - .../src/components/cashier-locked/index.ts | 3 + ...spec.js => cashier-notifications.spec.tsx} | 2 +- ...ications.jsx => cashier-notifications.tsx} | 11 +- .../components/cashier-notifications/index.js | 3 - .../components/cashier-notifications/index.ts | 3 + .../{confirm.spec.js => confirm.spec.tsx} | 24 +- .../src/components/confirm/confirm.scss | 4 + .../confirm/{confirm.jsx => confirm.tsx} | 41 +- .../cashier/src/components/confirm/index.js | 3 - .../cashier/src/components/confirm/index.ts | 3 + ...spec.js => crypto-fiat-converter.spec.tsx} | 15 +- ...onverter.jsx => crypto-fiat-converter.tsx} | 81 +- .../components/crypto-fiat-converter/index.js | 3 - .../components/crypto-fiat-converter/index.ts | 3 + ...crypto-transactions-cancel-modal.spec.tsx} | 3 +- ...s => crypto-transactions-history.spec.tsx} | 10 +- ... => crypto-transactions-renderer.spec.tsx} | 28 +- ...crypto-transactions-status-modal.spec.tsx} | 3 +- ...x => crypto-transactions-cancel-modal.tsx} | 20 +- ...ry.jsx => crypto-transactions-history.tsx} | 40 +- ...r.jsx => crypto-transactions-renderer.tsx} | 40 +- ...x => crypto-transactions-status-modal.tsx} | 19 +- .../{index.js => index.ts} | 2 +- ...r-dialog.spec.js => error-dialog.spec.tsx} | 3 +- .../{error-dialog.jsx => error-dialog.tsx} | 66 +- .../src/components/error-dialog/index.js | 3 - .../src/components/error-dialog/index.ts | 3 + ...tion.spec.js => funds-protection.spec.tsx} | 0 ...ds-protection.jsx => funds-protection.tsx} | 16 +- .../src/components/funds-protection/index.js | 3 - .../src/components/funds-protection/index.ts | 3 + ...no-balance.spec.js => no-balance.spec.tsx} | 0 .../src/components/no-balance/index.js | 3 - .../src/components/no-balance/index.ts | 3 + .../{no-balance.jsx => no-balance.tsx} | 31 +- .../{page-404.spec.js => page-404.spec.tsx} | 0 .../cashier/src/components/page-404/index.js | 3 - .../cashier/src/components/page-404/index.ts | 3 + .../page-404/{page-404.jsx => page-404.tsx} | 0 .../__tests__/percentage-selector.spec.js | 55 - .../__tests__/percentage-selector.spec.tsx | 68 + .../{index.js => index.ts} | 2 +- ...e-selector.jsx => percentage-selector.tsx} | 78 +- ...on.spec.js => recent-transaction.spec.tsx} | 0 .../components/recent-transaction/index.js | 3 - .../components/recent-transaction/index.ts | 3 + ...transaction.jsx => recent-transaction.tsx} | 32 +- ...il.spec.js => verification-email.spec.tsx} | 41 +- .../components/verification-email/index.js | 3 - .../components/verification-email/index.ts | 3 + ...ation-email.jsx => verification-email.tsx} | 22 +- .../src/containers/cashier/cashier.jsx | 2 +- .../src/containers/cashier/cashier.scss | 8 + .../cashier/src/pages/on-ramp/on-ramp.scss | 8 +- .../__tests__/payment-agent-list.spec.js | 1 + .../payment-agent-list/payment-agent-list.jsx | 7 + .../src/stores/account-transfer-store.js | 16 +- .../types/crypto-transaction-details.types.ts | 13 + packages/cashier/src/types/index.ts | 3 + packages/cashier/src/types/props.types.ts | 9 + packages/cashier/src/types/stores.types.ts | 12 + packages/cashier/tsconfig.json | 13 +- .../cfd/src/Components/cfd-account-card.tsx | 9 +- .../Containers/jurisdiction-modal-content.tsx | 6 +- .../cfd/src/Containers/jurisdiction-modal.tsx | 8 +- .../Containers/mt5-compare-table-content.tsx | 12 +- packages/components/README.md | 39 +- packages/components/docs/Modules/README.md | 0 packages/components/docs/README.md | 1 - .../src/components/dialog/dialog.jsx | 1 + .../icon/currency/ic-currency-tusdt.svg | 1 + .../components/src/components/icon/icons.js | 1 + .../password-input/password-input.jsx | 1 + .../components/positions-drawer-card/index.js | 3 + .../positions-drawer-card.jsx | 2 +- packages/components/src/index.js | 1 + packages/components/stories/icon/icons.js | 1 + packages/core/build/config.js | 80 +- packages/core/build/constants.js | 4 + packages/core/build/webpack.config.js | 6 +- .../AccountSwitcher/account-switcher.jsx | 24 +- packages/core/src/Stores/common-store.js | 8 + packages/core/src/Stores/rudderstack-store.js | 2 +- .../exchange_currency_rate.js | 7 + .../src/Utils/ExchangeCurrencyRate/index.js | 1 + packages/core/src/_common/base/socket_base.js | 3 + packages/p2p/crowdin/messages.json | 2 +- .../payment-methods-list.jsx | 18 +- .../payment-methods-list.scss | 5 + packages/p2p/src/translations/es.json | 5 +- packages/p2p/src/translations/fr.json | 61 +- packages/p2p/src/translations/id.json | 21 +- packages/p2p/src/translations/it.json | 3 +- packages/p2p/src/translations/pl.json | 1 - packages/p2p/src/translations/pt.json | 1 - packages/p2p/src/translations/ru.json | 1 - packages/p2p/src/translations/th.json | 61 +- packages/p2p/src/translations/tr.json | 1 - packages/p2p/src/translations/vi.json | 61 +- packages/p2p/src/translations/zh_cn.json | 3 +- packages/p2p/src/translations/zh_tw.json | 3 +- packages/publisher/README.md | 4 +- packages/reports/build/webpack.config.js | 1 - .../Elements/PositionsDrawerCard/index.js | 1 - .../reports/src/Containers/open-positions.jsx | 2 +- .../shared/src/utils/currency/currency.js | 11 +- .../declarative-validation-rules.js | 2 +- packages/trader/build/loaders-config.js | 3 - .../PositionsDrawer/positions-drawer.jsx | 5 +- .../src/Modules/Trading/Containers/trade.jsx | 49 +- .../src/Stores/Modules/Trading/trade-store.js | 15 +- packages/translations/crowdin/messages.json | 2 +- .../translations/src/translations/ach.json | 84 +- .../translations/src/translations/es.json | 166 +- .../translations/src/translations/fr.json | 84 +- .../translations/src/translations/id.json | 172 +- .../translations/src/translations/it.json | 166 +- .../translations/src/translations/ko.json | 84 +- .../translations/src/translations/pl.json | 172 +- .../translations/src/translations/pt.json | 84 +- .../translations/src/translations/ru.json | 112 +- .../translations/src/translations/th.json | 84 +- .../translations/src/translations/tr.json | 84 +- .../translations/src/translations/vi.json | 272 +- .../translations/src/translations/zh_cn.json | 84 +- .../translations/src/translations/zh_tw.json | 84 +- 156 files changed, 20000 insertions(+), 1576 deletions(-) create mode 100644 packages/account/src/Components/reset-trading-password-modal/__tests__/reset-trading-password-modal.spec.js create mode 100644 packages/account/src/Components/sent-email-modal/__tests__/sent-email-modal.spec.js rename packages/bot-web-ui/src/components/summary/{summary-card.jsx => summary-card.tsx} (87%) create mode 100644 packages/bot-web-ui/src/components/summary/summary-card.types.ts create mode 100644 packages/cashier/package-lock.json rename packages/cashier/src/components/cashier-container/{index.js => index.ts} (100%) rename packages/cashier/src/components/cashier-container/real/__tests__/{real.spec.js => real.spec.tsx} (64%) delete mode 100644 packages/cashier/src/components/cashier-container/real/index.js create mode 100644 packages/cashier/src/components/cashier-container/real/index.ts rename packages/cashier/src/components/cashier-container/real/{real.jsx => real.tsx} (70%) rename packages/cashier/src/components/cashier-container/virtual/__tests__/{virtual.spec.js => virtual.spec.tsx} (78%) delete mode 100644 packages/cashier/src/components/cashier-container/virtual/index.js create mode 100644 packages/cashier/src/components/cashier-container/virtual/index.ts rename packages/cashier/src/components/cashier-container/virtual/{virtual.jsx => virtual.tsx} (73%) rename packages/cashier/src/components/cashier-locked/__tests__/{cashier-locked.spec.js => cashier-locked.spec.tsx} (98%) rename packages/cashier/src/components/cashier-locked/{cashier-locked.jsx => cashier-locked.tsx} (89%) delete mode 100644 packages/cashier/src/components/cashier-locked/index.js create mode 100644 packages/cashier/src/components/cashier-locked/index.ts rename packages/cashier/src/components/cashier-notifications/__tests__/{cashier-notifications.spec.js => cashier-notifications.spec.tsx} (98%) rename packages/cashier/src/components/cashier-notifications/{cashier-notifications.jsx => cashier-notifications.tsx} (65%) delete mode 100644 packages/cashier/src/components/cashier-notifications/index.js create mode 100644 packages/cashier/src/components/cashier-notifications/index.ts rename packages/cashier/src/components/confirm/__tests__/{confirm.spec.js => confirm.spec.tsx} (83%) rename packages/cashier/src/components/confirm/{confirm.jsx => confirm.tsx} (88%) delete mode 100644 packages/cashier/src/components/confirm/index.js create mode 100644 packages/cashier/src/components/confirm/index.ts rename packages/cashier/src/components/crypto-fiat-converter/__tests__/{crypto-fiat-converter.spec.js => crypto-fiat-converter.spec.tsx} (88%) rename packages/cashier/src/components/crypto-fiat-converter/{crypto-fiat-converter.jsx => crypto-fiat-converter.tsx} (73%) delete mode 100644 packages/cashier/src/components/crypto-fiat-converter/index.js create mode 100644 packages/cashier/src/components/crypto-fiat-converter/index.ts rename packages/cashier/src/components/crypto-transactions-history/__tests__/{crypto-transactions-cancel-modal.spec.js => crypto-transactions-cancel-modal.spec.tsx} (96%) rename packages/cashier/src/components/crypto-transactions-history/__tests__/{crypto-transactions-history.spec.js => crypto-transactions-history.spec.tsx} (93%) rename packages/cashier/src/components/crypto-transactions-history/__tests__/{crypto-transactions-renderer.spec.js => crypto-transactions-renderer.spec.tsx} (83%) rename packages/cashier/src/components/crypto-transactions-history/__tests__/{crypto-transactions-status-modal.spec.js => crypto-transactions-status-modal.spec.tsx} (95%) rename packages/cashier/src/components/crypto-transactions-history/{crypto-transactions-cancel-modal.jsx => crypto-transactions-cancel-modal.tsx} (82%) rename packages/cashier/src/components/crypto-transactions-history/{crypto-transactions-history.jsx => crypto-transactions-history.tsx} (79%) rename packages/cashier/src/components/crypto-transactions-history/{crypto-transactions-renderer.jsx => crypto-transactions-renderer.tsx} (92%) rename packages/cashier/src/components/crypto-transactions-history/{crypto-transactions-status-modal.jsx => crypto-transactions-status-modal.tsx} (78%) rename packages/cashier/src/components/crypto-transactions-history/{index.js => index.ts} (93%) rename packages/cashier/src/components/error-dialog/__tests__/{error-dialog.spec.js => error-dialog.spec.tsx} (98%) rename packages/cashier/src/components/error-dialog/{error-dialog.jsx => error-dialog.tsx} (84%) delete mode 100644 packages/cashier/src/components/error-dialog/index.js create mode 100644 packages/cashier/src/components/error-dialog/index.ts rename packages/cashier/src/components/funds-protection/__tests__/{funds-protection.spec.js => funds-protection.spec.tsx} (100%) rename packages/cashier/src/components/funds-protection/{funds-protection.jsx => funds-protection.tsx} (81%) delete mode 100644 packages/cashier/src/components/funds-protection/index.js create mode 100644 packages/cashier/src/components/funds-protection/index.ts rename packages/cashier/src/components/no-balance/__tests__/{no-balance.spec.js => no-balance.spec.tsx} (100%) delete mode 100644 packages/cashier/src/components/no-balance/index.js create mode 100644 packages/cashier/src/components/no-balance/index.ts rename packages/cashier/src/components/no-balance/{no-balance.jsx => no-balance.tsx} (74%) rename packages/cashier/src/components/page-404/__tests__/{page-404.spec.js => page-404.spec.tsx} (100%) delete mode 100644 packages/cashier/src/components/page-404/index.js create mode 100644 packages/cashier/src/components/page-404/index.ts rename packages/cashier/src/components/page-404/{page-404.jsx => page-404.tsx} (100%) delete mode 100644 packages/cashier/src/components/percentage-selector/__tests__/percentage-selector.spec.js create mode 100644 packages/cashier/src/components/percentage-selector/__tests__/percentage-selector.spec.tsx rename packages/cashier/src/components/percentage-selector/{index.js => index.ts} (54%) rename packages/cashier/src/components/percentage-selector/{percentage-selector.jsx => percentage-selector.tsx} (54%) rename packages/cashier/src/components/recent-transaction/__tests__/{recent-transaction.spec.js => recent-transaction.spec.tsx} (100%) delete mode 100644 packages/cashier/src/components/recent-transaction/index.js create mode 100644 packages/cashier/src/components/recent-transaction/index.ts rename packages/cashier/src/components/recent-transaction/{recent-transaction.jsx => recent-transaction.tsx} (90%) rename packages/cashier/src/components/verification-email/__tests__/{verification-email.spec.js => verification-email.spec.tsx} (59%) delete mode 100644 packages/cashier/src/components/verification-email/index.js create mode 100644 packages/cashier/src/components/verification-email/index.ts rename packages/cashier/src/components/verification-email/{verification-email.jsx => verification-email.tsx} (85%) create mode 100644 packages/cashier/src/types/crypto-transaction-details.types.ts create mode 100644 packages/cashier/src/types/index.ts create mode 100644 packages/cashier/src/types/props.types.ts create mode 100644 packages/cashier/src/types/stores.types.ts delete mode 100644 packages/components/docs/Modules/README.md delete mode 100644 packages/components/docs/README.md create mode 100644 packages/components/src/components/icon/currency/ic-currency-tusdt.svg create mode 100644 packages/components/src/components/positions-drawer-card/index.js rename packages/{reports/src/Components/Elements/PositionsDrawerCard => components/src/components/positions-drawer-card}/positions-drawer-card.jsx (99%) create mode 100644 packages/core/src/Utils/ExchangeCurrencyRate/exchange_currency_rate.js create mode 100644 packages/core/src/Utils/ExchangeCurrencyRate/index.js delete mode 100644 packages/reports/src/Components/Elements/PositionsDrawerCard/index.js diff --git a/jest.config.base.js b/jest.config.base.js index 608fa1dfc74d..13094444785c 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -7,7 +7,7 @@ module.exports = { collectCoverageFrom: ['**/*.{js,jsx,ts,tsx}', '!**/node_modules/**'], coverageReporters: ['lcov'], coverageDirectory: './coverage/', - testRegex: '(/__tests__/.*|(\\.)(test|spec))\\.js?$', + testRegex: '(/__tests__/.*|(\\.)(test|spec))\\.(js|tsx)?$', // This is needed to transform es modules imported from node_modules of the target component. transformIgnorePatterns: ['/node_modules/(?!react-virtualized).+\\.js$'], setupFiles: ['/../../jest.setup.js'], diff --git a/package.json b/package.json index 56fda1e51417..b322f488ca9e 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@types/node": "^17.0.27", "@types/react": "^18.0.7", "@types/react-dom": "^18.0.0", + "@types/react-router-dom": "^5.1.6", "@typescript-eslint/eslint-plugin": "^5.8.0", "@typescript-eslint/parser": "^5.8.0", "babel-polyfill": "^6.26.0", diff --git a/packages/account/src/Components/currency-selector/__tests__/radio-button.spec.js b/packages/account/src/Components/currency-selector/__tests__/radio-button.spec.js index 9ec745764cf9..250df55c2cb6 100644 --- a/packages/account/src/Components/currency-selector/__tests__/radio-button.spec.js +++ b/packages/account/src/Components/currency-selector/__tests__/radio-button.spec.js @@ -19,10 +19,9 @@ describe('', () => { }; const ust_msg = - /send only tether omni to this deposit address\.sending tether erc20 to this address will result in the loss of your deposit\./i; + /Tether as an Omni token \(USDT\) is a version of Tether that is hosted on the Omni layer on the Bitcoin blockchain./i; - const usdt_msg = - /tether as an erc20 token \(eusdt\) is a version of tether that is hosted on ethereum, an open software platform where anyone can build and deploy decentralised applications\./i; + const usdt_msg = /Tether as an ERC20 token \(eUSDT\) is a version of Tether that is hosted on Ethereum./i; it('should render radiobutton', () => { render(); diff --git a/packages/account/src/Components/currency-selector/radio-button.jsx b/packages/account/src/Components/currency-selector/radio-button.jsx index eea203b6aa46..b99aa4e66f5f 100644 --- a/packages/account/src/Components/currency-selector/radio-button.jsx +++ b/packages/account/src/Components/currency-selector/radio-button.jsx @@ -10,16 +10,22 @@ const USTPopover = ({ id }) => { popover_message = ( <0 />Sending Tether ERC20 to this address will result in the loss of your deposit.' + 'Tether as an Omni token (USDT) is a version of Tether that is hosted on the Omni layer on the Bitcoin blockchain.' } components={[
]} /> ); + } else if (/^tUSDT$/i.test(id)) { + popover_message = ( + + ); } else { popover_message = ( ); @@ -82,7 +88,7 @@ const RadioButton = ({ ) : ( - {/^(UST|eUSDT)$/i.test(id) && } + {/^(UST|eUSDT|tUSDT)$/i.test(id) && }
{label}
({getCurrencyDisplayCode(id)})
diff --git a/packages/account/src/Components/poi/poi-country-selector/__tests__/poi-country-selector.spec.js b/packages/account/src/Components/poi/poi-country-selector/__tests__/poi-country-selector.spec.js index 97a1cc56019d..a5d11cd8ff19 100644 --- a/packages/account/src/Components/poi/poi-country-selector/__tests__/poi-country-selector.spec.js +++ b/packages/account/src/Components/poi/poi-country-selector/__tests__/poi-country-selector.spec.js @@ -23,25 +23,10 @@ describe('', () => { ], selected_country: '', setSelectedCountry: jest.fn(), - show_helper_msg: '', }; }); - it('should render CountrySelector component not external with helper message', () => { - mock_props.show_helper_msg = true; - - const { container } = render(); - - expect(screen.getByText('Proof of identity')).toBeInTheDocument(); - expect(screen.getByText('In which country was your document issued?')).toBeInTheDocument(); - expect(screen.getByText('Country')).toBeInTheDocument(); - expect(screen.getByText('Try submitting an ID document instead.')).toBeInTheDocument(); - - const div_with_external_class = container.querySelector('.external-dropdown'); - expect(div_with_external_class).not.toBeInTheDocument(); - }); - - it('should render CountrySelector component external without hepler message', () => { + it('should render CountrySelector component external', () => { mock_props.is_from_external = true; const { container } = render(); @@ -49,7 +34,6 @@ describe('', () => { expect(screen.getByText('Proof of identity')).toBeInTheDocument(); expect(screen.getByText('In which country was your document issued?')).toBeInTheDocument(); expect(screen.getByText('Country')).toBeInTheDocument(); - expect(screen.queryByText('Try submitting an ID document instead.')).not.toBeInTheDocument(); const div_with_external_class = container.querySelector('.external-dropdown'); expect(div_with_external_class).toBeInTheDocument(); diff --git a/packages/account/src/Components/poi/poi-country-selector/poi-country-selector.jsx b/packages/account/src/Components/poi/poi-country-selector/poi-country-selector.jsx index 3224aa5d5e78..0cc26836336b 100644 --- a/packages/account/src/Components/poi/poi-country-selector/poi-country-selector.jsx +++ b/packages/account/src/Components/poi/poi-country-selector/poi-country-selector.jsx @@ -11,7 +11,6 @@ const CountrySelector = ({ residence_list, selected_country, setSelectedCountry, - show_helper_msg, }) => { const [country_list, setCountryList] = React.useState([]); @@ -136,11 +135,6 @@ const CountrySelector = ({ - {show_helper_msg && ( - - {localize('Try submitting an ID document instead.')} - - )}