Suisin/resolve conflicts #90
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…deriv-com#9970) * chore: added hook for trading_platform_investor_password_change * refactor: used mutate function instead of rest params and added the types for request * refactor: added deprecated message added
…deriv-com#9867) * chore: added useDevice hooks * chore: added mixins to wallets package * refactor: devices mixin * fix: package-lock.json missing package * chore: add wrapper for mobile and desktop * chore: add ts comment for hook and style change * chore: remove wrappers
…orrect (deriv-com#9744) * chore: revamping payment_methods implementations * fix: payment method not showing in buy-add * chore: delete unused code and comment * refactor: refactor useP2PAdvertiserPaymentMethods, and other review comments * refactor: hooks, test files, remove unused code blocks * refactor: mutation payload type * fix: review comments * refactor: review comments * fix: review comments * fix: add display_name as dependency in useMemo * fix: error in buy-sell-modal pop up after reloading the window * fix: bug in stacked delete payment method modals
* feat: 🍱 added visual assets * Kyc/wall 1325/revamp poa section (#6) * feat: ✨ added new component * feat: ✅ added testcases * feat: account page revamp, cfd poa remove, account poa reuse * refactor: simplified && condition * chore: modal alignment styles * fix: failing tests * refactor: some ts issues resolve * refactor: poa container TS migration * chore: styles clarifications * refactor: poa form ts migration, code refactor * fix: ts ignore for cfd build * fix: commented code * fix: failing test * chore: code refactoring * chore: recreating PR for kyc-WALL-1322-revamp-poa-section * chore: incorporated review comments * chore: review comments * chore: review comments2 * chore: remove unused variable * chore: cfd-poa testcases * refactor: review comments * chore: review comments * ref: Incorporated review somments * chore: review coment * chore: review comments * chore: review comments addressing * fix: failing test * chore: styles code refactor * chore: spaces fix * refactor: file descriptions map array * chore: review comments * chore: review comments * chore: review comments * chore: compare account flow fix * chore: review comments * chore: review comments * chore: review comments * chore: review comments incorporating * fix: styling discrepancies * fix: back button condition * chore: remove back button * fix: failing test cfd-poa * refactor: localize change to component * refactor: 🎨 incorporated Localize component * chore: remove unused css and types * chore: wrong description on examples * fix: styles for resubmit message * fix: submitting error poa page * chore: mobing submit error to the top * fix: wrong message after submitting documents * refactor: boolean instead !! * chore: added gif as supported file * fix: failing test * fix: resolve path --------- Co-authored-by: Likhith Kolayari <likhith@regentmarkets.com> Co-authored-by: Likhith Kolayari <98398322+likhith-deriv@users.noreply.github.com> Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”>
* feat: mandatory pot upload * fix: pr comments updated * fix: wrong error message shown * feat: format amount in pot upload popup * feat: fix issue with modal not closing on order status change * feat: pr comment fix * feat: updated failing test
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
…d changing password (deriv-com#10025) * chore: added password change hook for creation and change password * chore: file name changed * fix: import error * fix: import file error patch * fix: import file error patch
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
* chore: add gradient background for wallet * chore: add gradient background for wallet * chore: add gradient to wallet header card * fix: mobile demo
* feat: add more wallets carousel * fix: code smells * fix: resolve comments and useAvailableWallets hook
* chore: add styles to wallet card carousel * chore: add styles and buttons * fix: standarize type * chore: rename progressbar * fix: props * fix: split components * chore: empty commit * fix: types * fix: comments * chore: comments * chore: comments * chore: rename description for useDevice * fix: comments * chore: conflicts
* feat: wallet accordion for desktop * feat: change accordion behaviors (active acc expanded by default) * chore: refactor accountlist and add animations * chore: hide account list / content from dom when accordion is closed * feat: options and multipliers account listing in wallet desktop * refactor: cleanup styles and delete unexpected props * chore: remove TradingAccountCard dynamic classname for divider and use css only * fix: options and multipliers translations
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
…ing / editing sell ad when fist time adding payment method (deriv-com#10046) * chore: revamping payment_methods implementations * fix: payment method not showing in buy-add * chore: delete unused code and comment * refactor: refactor useP2PAdvertiserPaymentMethods, and other review comments * refactor: hooks, test files, remove unused code blocks * refactor: mutation payload type * fix: review comments * refactor: review comments * fix: review comments * fix: add display_name as dependency in useMemo * fix: error in buy-sell-modal pop up after reloading the window * fix: bug in stacked delete payment method modals * fix: advertiser payment methods not showing in create and edit form * refactor: add props to sell-ad payment methods list
* fix: ⚰️ removed old text related to appstore * fix: ⚰️ removed old text related to appstore * chore: Trigger Build
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
… chec… (deriv-com#10065) * chore: addded new hook for investor Password reset + authorized check for accounts list * chore: removed authorized check for accounts list
* chore: add walletcurrencyicons * chore: refactor * chore: add gradient to mobile * chore: comments * chore: comments
* feat: 3rd party payment dispute reason added * fix: replace map with condition to use filter * fix: removed condition duplication * feat: added test case for new radio button * fix: pr review comment * fix: updated test
deriv-com#9351) * refactor: p2p-exchange-rate * refactor: moved usep2pconfig hook to the hook package * test: add usep2pconfig test file * fix: review comments * fix: circle/ci error * test: improve test case --------- Co-authored-by: niloofar sadeghi <niloofar.sadeghi@re-work.dev>
* fix: refactored the function to reduce cognitive complexity * chore: fix cognitive code complexity * fix: refactored tours * fix: removed tour interdependency * fix: added observer to missing files * chore: updated test cases * fix: addded common test cases * fix: addded common test cases * fix: added else check for toggleTourLoadModal * fix: tour test cases * fix: review comments * fix: review comments * fix: review comments * chore: removed redundant tour type key * fix: reverted icon changes * fix: reverted icon changes * fix: reverted icon changes * fix: reverted icon changes * chore: create refactor branch * refactor: refactored dbot tours * refactor: refactored tour trigger dialog * fix: removed redundant css * fix: removed previous button on step 1 and 2 * fix: cognitive complexity * fix: test cases * fix: test cases * fix: cognitive complexity * fix: cognitive complexity * fix: for onboarding mobile * fix: added eslint disable * fix: added eslint disable * fix: added eslint disable * fix: added eslint disable * fix: added eslint disable * fix: added eslint disable * fix: added eslint disable * fix: added eslint disable * fix: added eslint disable * fix: added eslint disable * fix: reverted lint changes * fix: added data test id --------- Co-authored-by: Farabi Chowdhury <farabi@deriv.com> Co-authored-by: Farabi <102643568+farabi-deriv@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
* feat: finishing cTrader flow * fix: finished cTrader flow * fix: success modal message changed * feat: added reusable trade modal to the flow * feat: added token to CTrader flow * fix: added ctrader token to the remaining parts of the project * fix: fixed the typo of cTrader in the token setter part * fix: fixed the google play icon issue * fix: removed the redundant condition * fix: made improvements to trade modal and fixed the jurisdiction modal text issue * feat: add demo/real transfers * fix: made changes according to suggestions * perf: minor fixes * chore: minor fix * chore: minor refactor * chore: minor refactor * chore: minor fixes * fix: apply comments * refactor: return side note to origin untild real ctrader release * fix: add sub title for demo ctrader account * refactor: improve naming * fix: added top up for cTrader * fix: fixed code smell issues * fix: fixed the type of CTraderAndDerivEZDescription component * fix: added cTrader to the onboarding page * fix: fixed the issue with the user redirections * fix: added support for qa1000 as well * fix: changed the server maintenance text * fix: changed the server maintenance text * fix: added the onelink for QRCodes * fix: added download center description and separated loadToken of ctrader from deriv x * fix: unhide the real account flow * fix: add ctrader account list * fix: updated the content of you need a deriv account pop up * fix: added ctrader to email and password part * fix: fixed the css issues of cTrader platform in password and email * fix: fixing cTrader issues * fix: fixing the issues that were raised after resolving the conflicts * fix: fixed the issue where all accounts were shown as Swap Free * fix: finished cTrader fixes * fix: changed web terminal icon and fixed windows download link and text * fix: fixed some issues of cTrader * fix: fixed the visibility of cTrader * fix: fixing the test cases * fix: fixed all of the test cases * fix: added return to fix the issue of sonar cloud * fix: removed real account from the flow * fix: removed the real account from the flow * fix: removing the redundant files from the PR * Update bot-notification.tsx * fix: removing the redundant files * fix: removing the redundant files * Update recent-footer.tsx * Update contract-details.jsx * Update recent-footer.tsx * Update download.tsx * Update faq-content.tsx * fix: made changes based on the comments in the PR * chore: small changes based on the comments * fix: making changes based on the comments * fix: fixed some small issues of cfds-listing * chore: making small changes based on the content changes * fix: made some small changes based on the new design * fix: fixing the server maintenance icon * fix: fixing issues raised for cTrader * fix: fixed the design changes * fix: added the tag for demo accounts * chore: made changes to trade modal text * fix: fixed the app description of cTrader * fix: fixed the issue where cTrader was shown for AU and Norway * fix: adding cTrader demo to top up modal * fix: disabled cTrader redirection link * fix: removed the issue where the blue part was shown in dxtrade * fix: fixed the issue of the tag for demo accounts * fix: hid the download part in the cTrader platform * chore: added cTrader to compare account * fix: fixing unit tests * chore: updated the terminal link * chore: updated the windows app link * fix: fixed the jurisdiction modal pop up issue * fix: fixing the unit tests * fix: build does not fail anymore * fix: removed cTrader from compare account * fix: fixing the sonar cloud issue --------- Co-authored-by: george-usynin-binary <heorhi@binary.com> Co-authored-by: George Usynin <103181646+heorhi-deriv@users.noreply.github.com>
…com#9349) * fix: 🐛 translation of IDV documents dropdown option * fix: 🐛 translation of default config * fix: 🐛 translation of default config * fix: 🐛 removed unused-import * fix: 🐛 refactored code * fix: ♻️ incorporated review comments * feat: ✨ added example formats for IDV docs * feat: ✨ added new text as requested by compliance * fix: ♻️ incorporated review comments * fix: country selector change language and fetch residence list (#46) * fix: country selector change language and fetch residence list * fix: residence list call for mt5 * fix: autocomplete not_found issue, loading poi page directly issue * refactor: avoid double call for fetching residence * refactor: current_language removed from deps * refactor: remove undefinied prop * fix: failing tests * fix: failing tests --------- Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”> * refactor: remove commented code * fix: wrong import * refactor: ♻️ incorporated review comments * fix: failing testcase * fix: ts any rreplace * fix: resolved path issues * fix: translation issue with No results found text in dropdowns * fix: translation issue with No results found text in dropdowns * fix: Country selecror in mobile * fix: Country selecror in mobile * fix: wrong file import name --------- Co-authored-by: yauheni-deriv <103182683+yauheni-deriv@users.noreply.github.com> Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”>
* fix: update bot name on saving bot * chore: nitpick - added line break
* fix: added eslint ignore sort * fix: added eslint ignore sort * fix: changed nextline to eslintdisable * fix: added eslint ignore sort
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
* fix: added disable sort * fix: added disable sort * fix: added disable sort * fix: added disable sort * fix: added disable sort * fix: for sort * fix: trigger
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
…-com#10096) * chore: added useCFDAccountsList + rename useMT5LoginList * chore: useCtraderAccountsList hook added * refactor: rename the ctrader in variables and updated comments * refactor: rename the variables and updated comments
* feat: add CFD section to wallets * chore: add mt5 section * chore: finish styles * chore: update button * chore: add ctrader * chore: comments * chore: key
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
… ads in My ads page (deriv-com#8112) * chore: fixed design changes for quick add modal * chore: added TODO * chore: fixed logic issue for dropdown * chore: fixed logic issues for input * chore: renamed add payment method with plural methods * chore: reordered imports * chore: fixed console error and logic for searching payment methods * chore: replaced observer imports
…on (deriv-com#10063) * chore(fix): make TIN & tax residence optional for real account creation flow * chore(doc): added comment to rule removal in config * chore: update regex validation in form config * chore: updated validation to ask tax residence only if TIN is filled * fix: remove TIN empty value from payload as BE does not accept empty value for TIN * chore: remove has_real_account check from details form * fix: update required prop for personal details form fields
…-com#9706) * chore: fixed chat footer styling * chore: fixed firefox chatbox not aligned
* feat: chat box message after order creation * feat: removed chat footer from chat section * feat: fixed issue with admin message not shown * chore: add unit test for chatbot message
suisin-deriv
requested review from
matin-deriv,
maryia-deriv,
hirad-deriv,
amina-deriv and
yashim-deriv
as code owners
suisin-deriv
merged commit bfdb98d
into
amina-deriv:accounts_team/accounts_package_ts_migration/sprint_6
1 check passed
amina-deriv
pushed a commit
that referenced
this pull request
Sep 20, 2023
* feat: connect turbos contracts_for & take barrier_choices * chore: add barrier count to turbos config * chore: connected proposal API + added Stake header + updated purchase button (#75) * Kate/87485/add Turbos to the Trade types list (#74) * feat: add turbos to trade types * feat: add icon for description * refactor: separate trade types description, change svg and make info icons being visible for mob * fix: replace icons name to proper define * fix: correct spelling for turbos icon * Kate/87510/add existing Take Profit component to Turbos Trade params (#77) * refactor: add existing take profit component for turbos * refactor: unite condition for riskmanagmentinfo component for multiplier and turbos * fix: maryia/hide info from purchase button correctly * hamza/ feat: Barrier Line Colors depend upon the contract type (#80) * feat: Barrier Line Colors depend upon the contract type * chore: Reafctor Barrier Line Colors depend upon the contract type v1.2 * chore: Reafctor Barrier Line Colors depend upon the contract type v1.3 * hamza/dynamic Turbos purchase button with icons (#79) * feat: Dynamics Buttons Desktop + Responsive * chore: refactor the code * chore: refactor chnages v1.2 * chore: refactor css * chore: refactor css v1.3 * chore: removed the function and moved to helpers * chore: removed the function and moved to helpers v1.1 * chore: removed the function and moved to helpers renamed v1.2 * Kate/87536/add existing Duration & Amount(Stake) components to Turbos Trade params (#78) * feat: create turbos info componenet, based on existing multiplier component * refactor: add duration and stake for turbos mobile based on existing component * refactor: unite two similar text components in one function, correct spelling in store * refactor: remove fuction from component and make it pure, change px to rem in styles * refactor: turn function into component and clean up props values * refactor: add todo comment * hamza/88083/To Adjust the purchase button styles including animation (#83) * chore: style changes v1.0 * fix: styling animation * fix: button styling responsive * fix: button styling responsive v1.3 * Kate/87506/To implement Turbos Contract card in Recent Positions drawer and Contract Details (#82) * feat: add proper type name for turbos in recent positions * refactor: extend getcontracttypedisplay function, do decomposing * refactor: config files for recent positions card * feat: add recent position card for desktop and plug in min and max stake * feat: add card for recent positions for mobile * fix: delete extra properties * refactor: add react fragment and shrink arrow function * fix: spelling in trade type * feat: add turbos contract card for contract details page for desktop * feat: add turbos card for details page mobile * refactor: replace wrong contracts type to turbos * refactor: add nested styles, rename variables * refactor: shrink styles for contract card * fix: status timer style * refactor: cleared classname * fix: change px to rem * Hamza / 87508/feat:To add Turbos to Open Positions page [Desktop & Responsive] (#85) * feat: desktop view added in reports open positions * chore: desktop view tweaks v1.1 * chore: open positions v1.3 * chore: Mobile Css v1.4 * fix: mobile responsive v1.5 * chore: open positions turbos and multipliers v1.6 * chore: open positions turbos and multipliers commented code v1.7 * refactor: UI Changes as per Figma and refactor Css * fix: Recent Positions and refactor Css v1.8 * fix: Recent Positions and refactor Css v1.9 * fix: Recent Positions and refactor Css v1.10 * fix: Recent Positions and refactor Css v1.11 * Kate/87395/add turbos barriers component (#87) * feat: init barriers components file * feat: add BrriersTable component with base styles * refactor: config files, fix css for card details and add toggle func for new comp * feat: add state for condition of rendering barrierstable component, add animation * feat: implement function for setting new barrier value * feat: add new component for list and list-item, refactor css and store function * feat: add new observable and set func to the store for hover value, add scroll comp * refactor: rename barriers component, restructured it, change type of mouse events, delete utilit * refactor: exclude extra component renders * feat: add collapsed barriers * refactor: rename params and remove a helper function to a separate file * chore: empty commit to triger tests * refactor: incapsulate logic of event handlers inside barriers-list component, replace input comp * refactor: change the structure of header_tooltip_text * refactor: replace header_tooltip_text with Localize component * refactor: change the structure of event handlers * refactor: delete extra class for hover * refactor: delete event handler * Kate/87397/[Responsive]: To add Collapsed Turbos barriers in Trade params (#91) * feat: add barrier collapsed for mobile, refactor css for trade type info card * fix: forgot call function * refactor: change style of payout per point in mobile acc to design * Hamza/ 88943 /feat: add Long & Short Tabs to trade params for desktop (#90) * feat: trade params turbos desktop v1.0 * feat: trade params turbos desktop v1.1 * feat: trade params turbos desktop tabs working v1.2 * fix: turbos short long tabs * fix: turbos short long tabs v1.4 * fix: turbos short long tabs v1.5 * fix: turbos short long tabs v1.6 * fix: turbos short long tabs v1.7 * fix: turbos short long tabs v1.8 * fix: turbos short long v1.9 * fix: turbos short long v1.10 * Kate/87400/add Expanded view for Turbos Barriers opening in a MobileDialog to Trade params (#93) * feat: add barriers expanded version for mobile * refactor: disabled btn if the selected barrier is the same * refactor: change scss selector and cover tooltip into div * refactor: cover header mobile in order to simplify css style * refactor: delete state for button and chnge styles for dark mode * refactor: increase the usage of text component * refactor: replace the rest of the text by Text component * refactor: add ternal operator * refactor: change the structure of barrier list and replace li with text * refactor: unite trade type info description for turbos * refactor: delete extra brakets Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> --------- Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> * Hamza/89706/test cases of new features (#96) * feat: trade type tabs test case added * feat: trade type tabs test case added v1.2 * feat: trade type tabs test case added v1.2.1 * feat: trade type tabs test case added v1.3 * feat: trade type tabs test case added v1.4 * feat: trade type tabs test case added v1.4.1 * feat: trade type tabs test case added v1.5 * feat: trade type tabs test case added v1.5.1 * feat: trade type tabs test case added v1.6 * feat: trade type tabs test case added v1.7 * feat: trade type tabs test case added v1.8 * fix: component test fix * fix: jest mock function removed * fix: string literals * Hamza/87396/feat: responsive trade type tabs (#98) * feat: responsive trade type tabs v1.0 * feat: responsive trade type tabs v1.1 * feat: responsive trade type tabs v1.2 * feat: responsive trade type tabs v1.3 * feat: responsive trade type tabs v1.4 * refactor: tradetypetabs integration into barrier selector * refactor: tradetypetabs integration into barrier selector v1.2 * Apply suggestions from code review --------- Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> * Kate/89669/tests for turbos (#97) * refactor: add tests for new components * refactor: add tests for new components * chore: correct spelling * refactor: remove duplicated classnames into a sep constant * refactor: delete extra test-id, which were in the comp by default * refactor: remove has_stop_loss from mock_props * refactor: add has_stop_loss to mock_props * refactor: implemented suggestions * refactor: delete extra backticks * refactor: add more tests and delete extra property * fix: change style for turbos contract card (#100) * refactor: maryia/refactored TurbosInfo, tests & OpenPositions * Kate/90808/90829/ To migrate turbos-card-body, turbos-trade-description, barrier-selector and barrier-list to TS together with their tests (#102) * refactor: ts migration of new components for turbos with tests * refactor: migrate BarrierSelector to TS, update tests * refactor: translate TurbosCardBody to TS * refactor: translate TurbosCardBody tests * refactor: deal with ts errors in logic.ts * refactor: update packege json for trader by adding more test dependen * refactor: migrate turbos-card-body test to ts * refactor: delete extra pass of properties in test TurbosCardBody * refactor: migrate barrier-utils and add test * refactor: delete extra portals in test * refactor: delete extra type * refactor: translate tradeTypeTabs to ts with tests and apply recent design changes * Update packages/trader/src/Modules/Trading/Components/Form/TradeParams/Turbos/barrier-selector.tsx --------- Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> * Kate/90812/To migrate turbos-info and payout-per-point to TS together with their tests + add tests for payout-per-point (#104) * refactor: migrate to TS PayoutPerPoint and TurbosInfo with tests * Update packages/trader/src/Modules/Trading/Components/Elements/Turbos/payout-per-point.tsx * Apply suggestions from code review Co-authored-by: Matin shafiei <matin@binary.com> --------- Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> Co-authored-by: Matin shafiei <matin@binary.com> * refactor: update function for turbos cards filtration (#105) * chore: vanilla+turbos adjustment * chore: integrate turbos into options in open positions * chore: maryia/design adjustments * Kate/87523/Make barriers and payout per point collapsible in responsive (#106) * feat: make barriers and payout collapsible * refactor: change getTurbosSubtype function and add cards filtration for mobile * refactor: lift up the mobile chart for turbos * feat: add more details in tooltip * refactor: shrink getTurbosSubtype function * feat: update charts version * chore: add package lock file * fix: add flags for vanillas * Kate/91508/To finalize Payout per point component and its tooltip (#110) * refactor: expand getContractSubtype function * refactor: delete round for turbos payout per point * fix: change test case * refactor: replace base tags with text tag and add duration text function (#111) * Kate/91602/Display Long and Short open contracts in DTrader chart simultaneously (#112) * feat: show both long and short recent contracts on chart * refactor: add short and long options for barrier in store in order to display correct val * Apply suggestions from code review --------- Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> * refactor: maryia/rounding payout per point + refactoring * Kate/91815/Final checks and adjustments (#113) * refactor: delete decimals for payout per point in Turbos * refactor: minor changes and add arrow in payout per point * fix: add arrow for mobile payout per point turbos * refactor: add longcode as info in contract details for vanillas * chore: change btn name * refactor: reused MinMaxStakeInfo & PayoutPerPointMobile for vanillas and turbos + improvements * Kate/91999/Technical debt: To reuse Vanillas & Turbos common UI elements (#114) * refactor: apply trade type tabs to vanilla * refactor: apply barriers list for vanilla * refactor: remove bode list to a separate components * chore: small changes according to pr suggestions * fix: return undefind for amount and fieldset * Apply suggestions from code review --------- Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com> * refactor: barriers-list and its body & trade-type-tabs * refactor: address review comments * refactor: address review comments * refactor: remove getTurbosDurationText * refactor: old getDurationUnitText to reduce cognitive complexity * fix: address review comments * fix: conditional rendering of total profit/loss * fix: replace time and add comment (#116) * Kate/refactor after last review (#117) * refactor: delete extra filed in object * refactor: add storeProvider and mockStore for tests * chore: optimise code size * fix: bug with contract info slider * fix: bug with contract info and refactor widget component * chore: rename constant for tests * refactor: add T prefix * chore: remove extra const * fix: filter turbos cards in responsive & reports popover text * refactor: address review comments * refactor: TurbosTradeDescription content * Merge branch master of github.com:binary-com/deriv-app into maryia/87354/task-add-turbos * chore: caching barrier choices and selected barrier for turbos * fix: add response check (#118) * Kate/92888/turbos content update (#119) * refactor: update content for contract type and payout per point * chore: update text in contract type info test * Kate/93137/Profit value is not displayed right in the contract details page (#120) * fix: add profit for turbos card after contract is sold * chore: update unit tests for turbos card body * chore: add optional chaining for response error check * chore: remove rounding for barrier in contract card * refactor: change formatting for barrier in turbos card * chore: add ternary operator for formating * chore: remove extra sign * refactor: make first barrier chosen by default * refactor: delete extra optional chaning * fix: bug with barriers in contract details (#121) * fix: maryia/93143/chart markers count in contract details + refactoring * revert: unnecessary change to chart markers count for turbos * Kate/93403/Payout per point is not displayed in contract detail page (#122) * feat: add payout per point for turbos contract details * fix: replace reg exp for turbos and vanillas * refactor: minor refactoring * revert: no longer needed changes in useStore.tsx * Kate/93332/CD: [Change Request] replace contract card fields by new ones (#123) * refactor: change turbos details * feat: add third row to contract card with new values and rewrite tests * refactor: make total profit loss always visible for turbos card * chore: rename classname * fix: change style for turbos mobile (#124) * Kate/Barrier text in the section is not aligned properly (#125) * fix: change aligment for turbos Vanillas and Accum fieldset titles * refactor: replace px by rem * build: fix types * fix: imports for new tsx files * refactor: replace old turbo icons (#126) * fix: types + localization + reverted Vanillas tooltip text changes * fix: add icon for turbos long * chore: update icon bundle * refactor: use number of contracts instead of shortcode * refactor: sonarcloud + tests * fix: conflicts + address review * refactor: as per reviews * fix: apply gradient style to all contracts (#132) * chore: improve types as per reviews * chore: address reviews * refactor: sonarcloud warnings * build: trigger build * refactor: rename number of contracts (#134) * Kate / Apply suggestions from last code review (#135) * refactor: delete duplicared file and add constants for turbos names * refactor: apply suggestions from review * fix: address review comments * test: fix tests * fix: types * fix: sonarcloud warnings * build: trigger checks * fix: remove barrier shade * fix: contract card values alignment * fix: missing colon after Barrier * chore: add vanilla header with timer to turbos contract card in mobile reports * fix: sonarcloud warning * chore: show full title only in open positions * build: trigger build * fix: types in open-positions * fix: address review comments about types * refactor: type * build: empty commit --------- Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com> Co-authored-by: Muhammad Hamza <120543468+hamza-deriv@users.noreply.github.com> Co-authored-by: Matin shafiei <matin@binary.com> Co-authored-by: kate-deriv <kate@regentmarkets.com>
amina-deriv
pushed a commit
that referenced
this pull request
Aug 5, 2024
…_with_quill_modal Suisin/chore: replace modal with quill-ui modal
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
Resolve conflicts coming from master
Screenshots:
Please provide some screenshots of the change.