Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

amam/fix_design #76

Merged
merged 18 commits into from
May 21, 2019
Merged

amam/fix_design #76

merged 18 commits into from
May 21, 2019

Conversation

cakasuma
Copy link
Contributor

@cakasuma cakasuma commented May 21, 2019 •
edited
Loading

  • fix full page modal show when loading
  • fix animation and design break on tab slider and reports
  • remove display OHLC (asset information)
  • fix eternal loading, when change granularity of charts and reload

ashkanx
ashkanx previously approved these changes May 21, 2019
View reviewed changes
@ashkanx ashkanx merged commit f1bcaf8 into binary-com:dev May 21, 2019
@zaki-hanafiah zaki-hanafiah mentioned this pull request May 22, 2019
Merged
hamza-deriv added a commit to hamza-deriv/deriv-app that referenced this pull request Apr 18, 2023
@hamza-deriv
refactor: replace connect in Trader package v1.0 (binary-com#76)
f9f0d0d
shaheer-deriv referenced this pull request in shaheer-deriv/deriv-app May 31, 2023
@shaheer-deriv
Merge pull request #76 from shaheer-deriv/shaheer/feature/90115/updat…
75bef86 
…e_jurisdiction

Shaheer/feature/90115/update jurisdiction
sandeep-deriv pushed a commit that referenced this pull request Jun 12, 2023
@jim-deriv @hamza-deriv
Jim | Hamza/88557/replace-connect-with-use-store-trader-parent (#8270)
a431f4c 
* chore: add useTraderStores

* chore: add trader-providers

* refactor: replace MobxContentProvider with TraderProviders

* chore: update trader to trade

* refactor: replace connect in Trader package v1.0 (#76)

* refactor: contract-replay, contract-drawer and contract-drawer-card to use useStore (#77)

* Jim/93585/replace connect with usestore in market countdown timer market unavailable trade modals unsupported contract modal (#79)

* refactor: remove connect from market-countdown-timer

* refactor: remove connect from market-unavailable

* refactor: remove connect from trade-modals

* refactor: move is_visible prop to market-unavailable

* refactor: remove connect from unsupported-contract-modal

* Hamza/93474/replace connect with use trader store (#78)

* refactor: replace connect in Trader package v1.0

* refactor: replace connect with useTraderStore v1.2

* refactor: replace connect with useTraderStore v1.2.1

* refactor: replace connect with useTraderStore v1.2.2

* refactor: replace connect with useTraderStore v1.2.3

* Hamza/93474/replace connect with use trader store (#80)

* refactor: replace connect in Trader package v1.0

* refactor: replace connect with useTraderStore v1.2

* refactor: replace connect with useTraderStore v1.2.1

* refactor: replace connect with useTraderStore v1.2.2

* refactor: replace connect with useTraderStore v1.2.3

* refactor: replace connect with useTraderStore v1.3

* refactor: replace connect with useTraderStore v1.4

* Jim/93604/replace connect with use store in positions drawer positions modal card toggle positions mobile time picker populate header (#81)

* refactor: remove connect from positions-drawer

* refactor: remove connect from positions-modal-card

* refactor: remove connect from toggle-positions-mobile

* refactor: remove connect from time-picker

* refactor: remove connect from populate-header

* Jim/93667/replace connect with use store in trade header extensions trade settings extensions progress slider stream routes (#83)

* refactor: remove connect from positions-drawer

* refactor: remove connect from positions-modal-card

* refactor: remove connect from toggle-positions-mobile

* refactor: remove connect from time-picker

* refactor: remove connect from populate-header

* refactor: remove connect from trade-footer-extensions

* refactor: migrate trade-header-extensions to ts and remove connect from it

* refactor: migrate trade-settings-extensions to ts and remove connect from it

* refactor: remove connect from progress-slider-stream and routes

* chore: update mocstore with new fields

* Hamza/93474/replace connect with use trader store (#82)

* refactor: replace connect in Trader package v1.0

* refactor: replace connect with useTraderStore v1.2

* refactor: replace connect with useTraderStore v1.2.1

* refactor: replace connect with useTraderStore v1.2.2

* refactor: replace connect with useTraderStore v1.2.3

* refactor: replace connect with useTraderStore v1.3

* refactor: replace connect with useTraderStore v1.4

* refactor: replace connect with useTraderStore v1.5

* refactor: replace connect with useTraderStore v1.5.1

* refactor: replace connect with useTraderStore v1.5.2

* refactor: replace connect with useTraderStore v1.5.3 test failing fixed

* refactor: replace connect with useTraderStore v1.5.4

* Jim/88556/replace connect with use store in settings chart accumulators stats contract replay widget contract and toolbar widgets (#84)

* chore: removeconnectsettings-chart/accumulators-stats/contract-replay-widget/contracttoolbar-widgets

* refactor: remove connect from accumulators-stats.spec

* refactor: replace connect in top-widgets_cancel-deal-mobile_risk-management-info_mobile-widget

* Hamza/93474/replace connect with use trader store (#85)

* refactor: replace connect in Trader package v1.0

* refactor: replace connect with useTraderStore v1.2

* refactor: replace connect with useTraderStore v1.2.1

* refactor: replace connect with useTraderStore v1.2.2

* refactor: replace connect with useTraderStore v1.2.3

* refactor: replace connect with useTraderStore v1.3

* refactor: replace connect with useTraderStore v1.4

* refactor: replace connect with useTraderStore v1.5

* refactor: replace connect with useTraderStore v1.5.1

* refactor: replace connect with useTraderStore v1.5.2

* refactor: replace connect with useTraderStore v1.5.3 test failing fixed

* refactor: replace connect with useTraderStore v1.5.4

* refactor: replace the connect with useStore v1.6

* fix: reverted the duration-wrapper

* fix: the duration-wrapper

* refactor: replace connect in top-widgets_cancel-deal-mobile_risk-management-info_mobile-widget (#86)

* refactor: restore component structure to its original form

* refactor: remove MobxContentProvider

* refactor: replace connect in strike, vanilla-trade-type, screen-small, chart-widgets, and test

* Jim/93866/replace_connect_with_usestore_in_strike_vanilla-trade-type_screen-small_chart-widgets_and_test (#87)

* refactor: replace connect in top-widgets_cancel-deal-mobile_risk-management-info_mobile-widget

* refactor: restore component structure to its original form

* refactor: remove MobxContentProvider

* refactor: replace connect in strike, vanilla-trade-type, screen-small, chart-widgets, and test

* Hamza/93474/replace connect with use trader store (#88)

* refactor: replace connect in Trader package v1.0

* refactor: replace connect with useTraderStore v1.2

* refactor: replace connect with useTraderStore v1.2.1

* refactor: replace connect with useTraderStore v1.2.2

* refactor: replace connect with useTraderStore v1.2.3

* refactor: replace connect with useTraderStore v1.3

* refactor: replace connect with useTraderStore v1.4

* refactor: replace connect with useTraderStore v1.5

* refactor: replace connect with useTraderStore v1.5.1

* refactor: replace connect with useTraderStore v1.5.2

* refactor: replace connect with useTraderStore v1.5.3 test failing fixed

* refactor: replace connect with useTraderStore v1.5.4

* refactor: replace the connect with useStore v1.6

* fix: reverted the duration-wrapper

* fix: the duration-wrapper

* fix: contract not bought error config missing from props

* refactor: remove connect function definition and connectwithcontractupdates

* Jim/93908/remove-connect-and-connect-with-contract-updates-definitions from trader (#89)

* refactor: replace connect in top-widgets_cancel-deal-mobile_risk-management-info_mobile-widget

* refactor: restore component structure to its original form

* refactor: remove MobxContentProvider

* refactor: replace connect in strike, vanilla-trade-type, screen-small, chart-widgets, and test

* refactor: remove connect function definition and connectwithcontractupdates

* refactor: address whitespace comments, type exportsclear

* chore: remove unused invalid import

* chore: add type keyword on import statement

* chore: add whitespace

* refactor: remove passthrough.root_store

* chore: restore props

* chore: remove sonarcloud bug

* refactor: wrap allowequalsmobile in a div to make it collapsible

---------

Co-authored-by: Muhammad Hamza <120543468+hamza-deriv@users.noreply.github.com>
utkarsha-deriv pushed a commit to utkarsha-deriv/deriv-app that referenced this pull request May 2, 2024
@suisin-deriv
Merge pull request binary-com#76 from suisin-deriv/suisin/UPM823/conf…
39c8894 
…irm_your_number_modal

Suisin/upm823/confirm your number modal
balakrishna-deriv added a commit that referenced this pull request Jun 5, 2024
@maryia-deriv @kate-deriv @balakrishna-deriv
[DTRA] Kate/Maryia/DTRA-1279/Redesign: Positions page (#15234)
672615a 
* 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
Reviewers

@negarn negarn negarn left review comments

@ashkanx ashkanx ashkanx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cakasuma @ashkanx @negarn