Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <salar@re-work.dev> Co-authored-by: Matin shafiei <matin@binary.com> * 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 <matin@binary.com> * Chore: Added NIN option in IDV dropdown for ng clients (#4970) * fix: payment info issue (#4978) Co-authored-by: Matin shafiei <matin@binary.com> * 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 <matin@binary.com> * Maryia/TrackJS_Avoiding_Pushwoosh_Failed_to_fetch_error (#4894) * Maryia/Checking network status before initializing Pushwoosh * Maryia/refactoring Co-authored-by: Matin shafiei <matin@binary.com> * 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 <matin@binary.com> * 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 2c19bed. Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> * <SearchBox /> test coverage (#4900) Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com> * Artsem / <Verification /> test coverage (#4890) * <Verification /> 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 2771958. * 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 <salar@re-work.dev> Co-authored-by: Matin shafiei <matin@binary.com> 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 <bahar@firstsource.tech> 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 <akmal@binary.com> 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 <ali.hosseini@firstsource.tech> Co-authored-by: sara-fs <55442058+sara-fs@users.noreply.github.com> Co-authored-by: Matin shafiei <matin@deriv.com>
- Loading branch information
25 people
committed
Mar 21, 2022
1 parent
70ea4c7
commit 725636b