Shontzu/fixing issues in the cards that was fixed and closed but reverted when merging #69
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
…Missing-s-from-the-spread-word-from-Compare-Account-modal shontzu/CFDS-733/Missing-s-from-the-spread-word-from-Compare-Account-modal
…Indices-and-Leverage-words-should-be-in-lowercase shontzu/CFDS-734/Indices-and-Leverage-words-should-be-in-lowercase
…The-Regulator/External-Dispute-Resolution-word-should-be-in-new-line shontzu/CFDS-735/The-Regulator/External-Dispute-Resolution-word-should-be-in-new-line
…he-markets-offerings-for-MT5-Financial-Labuan-is-different-from-design
…The-markets-offerings-for-MT5-Financial-Labuan-is-different-from-design fix: updated markets offerings for MT5 Financial Labuan
…Deriv-X-Other-CFDs-Missing-the-word-Platform-and-Forex-standard/micro-should-show-Forex-only shontzu/CFDS-752/Deriv-X-Other-CFDs-Missing-the-word-Platform-and-Forex-standard/micro-should-show-Forex-only
…Mobile_Android_Demo_Real_Icon-of-Forex-and-Cryptocurrencies-have-a-different-size-and-inconsistent-as-others fix: icon size inconsistencyn mobile VP
…Regulator-name-displayed-in-a-different-line-from-design shontzu/CFDS-785/Regulator-name-displayed-in-a-different-line-from-design
…Markets-offerings-for-swap-free-is-wrong-in-compare-account fix: fixed
…Compare-CFDs-demo-account-not-be-able-to-scroll-down-full-in-mobile shontzu/CFDS-763/Compare-CFDs-demo-account-not-be-able-to-scroll-down-full-in-mobile
…The-Regulator/External-Dispute-Resolution-word-should-be-in-new-line shontzu/CFDS-735/The-Regulator/External-Dispute-Resolution-word-should-be-in-new-line
…ok/deriv-app into feature-revamp-compare-account-2
…ok/deriv-app into feature-revamp-compare-account-2
Pull Request Test Coverage Report for Build 5735877748
💛 - Coveralls |
shontzu-deriv
changed the title
shontzu-deriv
changed the title
shontzu-deriv
changed the title
hirad-deriv
reviewed
Aug 2, 2023
package-lock.json
Outdated
There was a problem hiding this comment.
What is the reason of making changes to package-lock.json ?
|
⏳ Generating Lighthouse report... |
hirad-deriv
reviewed
Aug 2, 2023
| @@ -3,7 +3,7 @@ import classNames from 'classnames'; | |||
| import Icon from '../icon'; | |||
| import Input from '../input'; | |||
|
|
|||
| const DatePickerIcon = ({ icon, ...props }: React.ComponentProps<typeof Icon>) => ( | |||
| const DatePickerIcon = ({ icon, ...props }: React.ComponentProps<typeof Icon>) => ( | |||
There was a problem hiding this comment.
This file should not be in this PR. This is just the prettier change. Exclude it from the PR please.
remove extra whitespace
hirad-deriv
approved these changes
Aug 3, 2023
hirad-deriv
merged commit fda8ec3
into
hirad-deriv:feature-revamp-compare-account
1 check passed
hirad-deriv
pushed a commit
that referenced
this pull request
Jun 13, 2024
* chore: empty commit * feat: tabs + background + initialized EmptyMessage component * Maryia/Positions-redesign/improve EmptyMessage component + add tests (#50) * feat: redirect to trade upon button click on the empty page * test: EmptyMessage * chore: empty commit * DTRA-1279 / Kate / Filter [WIP] (#51) * feat: add dropdowm and action sheet * feat: add apply functionality * chore: remove unused functionality * refactor: separate apply logic * feat: add clear all functionality * feat: apply filtration logic * fix: filtration bug * chore: rename variables * refactor: extract filtration logic into a util function * chore: empty commit * fix: sonarcloud issues * chore: empty commit * chore: add modules store and useclosedposition hook (#52) * refactor: remove todo and change some prop based on quill updates (#54) * DTRA-1279 / Kate / Use hook for real data (#55) * feat: use hook for real data * refactor: apply suggestions * Maryia/positions-redesign/Contract cards [WIP] (#53) * feat: init ContractCard * feat: Contract cards * feat: use ReportsStoreProvider * style: remove unnecessary comment * fix: key * fix: remove old card styles * fix: types * fix: use contract_info in filterPositions * fix: do not show buttons for sold contracts * DTRA-1279 / Kate / Refactor handling open and closed positions and their filtration (#56) * refactor: move stor values to poitions content file * chore: remove code smell * Maryia/positions-redesign/Contract cards improvements + fetching Open positions + formatProfitTableTransactions TS migration (#58) * refactor: contract-card-list and card * feat: buttons demo + animation improvements * feat: finilize Duration component for the card * chore: ts migration for closed positions * fix: console error with remaining time & showing empty message only when empty * feat: connect real open postions + style and filter fixes * fix: style * DTRA-1279/ Kate / Create filter component (#57) * feat: create new filter component * feat: apply radio button * refactor: default time filter logic * feat: add time filtration * refactor: remove unused css * DTRA-1279 / Kate / Refactor: add new content for empty page (#59) * refactor: add new content for empty page * chore: test text update * Maryia/positions-redesign/Contract cards data update fix (#61) * fix: Accumulators tick passed count * fix: contract cards update * fix: show loading only when should not show empty message or cards * chore: update quill version (#63) * Maryia/positions-redesign/Contract card loading state and status timer updates + EmptyPositions update (#64) * feat: loading functionality + fix for status timer * chore: update copy for empty-positions * revert: use hasActionButtons prop instead of impicit onClose * DTRA-1279/ Kate/ Feat: add Date picker (#62) * feat: add second action sheet * feat: add date range formatting and refactored existing code * feat: add range selection filtration * refactor: chip and time filter * fix: empty posituions after filtration * refactor: do clean up * chore: rename variables * chore: localization * DTRA-1279 / Kate/ Add filtration hooks (#65) * feat: create hooks * refactor: rename methods * DTRA-1279 / Kate / Add tests (#66) * refactor: add tests for chip component * refactor: add tests for date picker * refactor: add tests for contract type filter * refactor: add tests for custom time filter button * refactor: add tests for positions utils * DTRA-1279 / Kate / Double filtration and extra filter options (#67) * fix: filtration for today and yersterday * fix: double filter * refactor: change style after design confirmation and sort props * refactor: start adding tets for time filter * chore: apply suggestions * chore: update quill and token library version * DTRA-1279 / Kate / Add section separator (#68) * feat: add sections with date * feat: make filter always visible * refactor: style for date separator * refactor: format time function * refactor: add tests * chore: remove unused wrapper * chore: apply suggestions * DTRA-1279 / Kate / Tech Debt (#69) * refactor: add more test cases for time-filter * refactor: add tests for hooks * refactor: removed some todos * Maryia/positions-redesign/finilise contract card + add total profit loss + initiate pagination in closed positions (#70) * refactor: utilize Tag in ContractCardStatusTimer * chore: add opacity transition to buttons when revealing/hiding them * feat: add total profit + improve card * fix: card deletion transition + total pnl positioning * feat: add pagination on scroll (initial version) * fix: loading state and loading more on infinite scroll in Closed tab (#71) * DTRA-1279 / Kate / Tech Debt part 2 [WIP] (#72) * refactor: add tests for utils functions + removed unused hook * refactor: move total profit loss to a separate folder and add tests * refactor: add tests for positions * refactor: add tests for position content file * Maryia/positions-redesign/test contract card + fix scroll behavior, dates formatting, and filtering Closed positions (#73) * test: contract-card * fix: hide filters on scroll + utilize moment for formatting date in closed tab * refactor: update quill version and refactor * refactor: chip component (#74) * refactor: position content page * Maryia/positions-redesign/test: ContractCardList, ContractCardStatusTimer, PositionsStore, getCurrentTick() + refactoring (#75) * test: contract-card-list * test: ContractCardStatusTimer * test: getCurrentTick() in contract.tsx in shared * test: PositionsStore * test: add more tests to ContractCardList * refactor: desctructure props in mocked component * Maryia/positions-redesign/fix: tests + address sonarcloud + use clsx (#76) * fix: tests + address sonarcloud * refactor: use clsx instead of classnames * refactor: sonarcloud - reduce complexity * fix: cards filtering in PositionsContent + tests + style+bug fixes * build: trigger checks * fix: hasNoActiveFilters condition * fix: update package version and remove prop from action sheet * chore: rename function * Maryia/positions-redesign/feat: display correct active positions count (#77) * feat: display correct active positions count * fix: BottomNav tests * refactor: filter behaviour * chore: add padding * fix: positions count in footer to not show 0 (#78) * refactor: total profit loss * chore: add tests for tpl and refactor date picker * refactor: add loadre inside of empty positions * fix: tests * Maryia/positions-redesign/fix: loader on infinite scroll in Closed tab + make redirectTo prop optional in ContractCard (#79) * fix: place loading after contract cards sections * chore: make redirection optional when clicking on contract card * chore: rename timet * DTRA-1279 / Kate / Add a single date selection (#80) * feat: add partial range * refactor: tests * refactor: callback --------- Co-authored-by: kate-deriv <kate@regentmarkets.com> Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com> Co-authored-by: balakrishna-deriv <56330681+balakrishna-deriv@users.noreply.github.com>
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:
The issues in the cards that was fixed and closed returned
Screenshots: