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.

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

Maryia/Merged master + resolved conflicts + fixed tests #10

Commits on Jun 30, 2022

  1. Ako/ Add general doc for ts and git (binary-com#5763)

    * doc/ add TS general doc
    
    * docs/ add git general doc
    
    * docs/ commit message guide lines
    
    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    Ali(Ako) Hosseini and carolsachdeva committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    e5e1d08 View commit details
    Browse the repository at this point in the history
  2. thisyahlen/ add terms and conditions link to the error message (binar…

    …y-com#5788)
    
    * add terms and conditions link to the error message
    
    * changed the name and added jsx
    
    * mobile view fix
    
    Co-authored-by: Thisyahlen <thisyahlen@Thisyahlens-MacBook-Pro.local>
    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    3 people committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    47fb870 View commit details
    Browse the repository at this point in the history
  3. removed transaction time banner (binary-com#5832)

    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    farrah-deriv and carolsachdeva committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    8b8ceff View commit details
    Browse the repository at this point in the history
  4. Niloofar / Review root documentation (binary-com#5732)

    * Review root documentation and add more guide to it
    
    * add some blank line to improve readablity
    
    * update doc
    
    * update doc
    
    * update doc
    
    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    niloofar-deriv and carolsachdeva committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    31e35ee View commit details
    Browse the repository at this point in the history
  5. Mehrzad / 67102 / refactor contract card loading to TS (binary-com#5716)

    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    mehrzad-fs and carolsachdeva committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    15413db View commit details
    Browse the repository at this point in the history
  6. likhith/fix Error modal title in Edit ad (binary-com#5466)

    * fix: Error modal title in Edit ad
    
    * ref: Code refactored
    
    * fix: checking for response before executing function block
    
    * fix: sync content between create and edit ad
    
    * fix: removed commented code
    
    Co-authored-by: Likhith Kolayari <likhith@deriv.com>
    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    3 people committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    413d990 View commit details
    Browse the repository at this point in the history
  7. likhith/display trustpilot notification only after a week since accou…

    …nt creation (binary-com#5822)
    
    * feat: display trustpilot notification only after a week since account creation
    
    * Update packages/core/src/App/Components/Elements/NotificationMessage/notification.jsx
    
    Co-authored-by: Matin shafiei <matin@binary.com>
    
    * ref: renamed variable
    
    * ref: moved display condition from notification to app-notification-message component
    
    * ref: removed if else block
    
    * ref: moved trustpilot display logic to notification store
    
    * ref: removed commented code
    
    * fix: resolved incorrect proprty fetch value
    
    Co-authored-by: Matin shafiei <matin@binary.com>
    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    3 people committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    40123d2 View commit details
    Browse the repository at this point in the history
  8. Adrienne / Changed layout for PM cards list in Ads page (binary-com#5284

    )
    
    * PM cards in mobile layout is now horizontal according to design, PM cards layout in Add PM method Ads page is now grid layout
    
    * eslint formatted
    
    * Refactored changes to a new component
    
    * eslint formatted
    
    * Delete icons.js
    
    Unstage eslint formatted file `icons.js`
    
    * Revert icons.js deletion
    
    * Refactored code
    
    * Alphabetize new component props
    
    * Alphabetize new component props
    
    * Refactored quick add PM modal to include new PM layout changes
    
    * Refactored quick add PM modal to include new PM layout changes
    
    * Renamed component
    
    * Removed redundant css class for sell ad PM list
    
    * Added css class for horizontal scrolling
    
    * Fixed CircleCI build issue
    
    * Sorted payment methods in order
    
    * Adjusted PM categories order in My Profile PM and Add PM card height
    
    * Adjusted PM categories order in My Profile PM and Add PM card height
    
    * Adjusted card margin for My Profile page and sorted pm cards in sell ad modal
    
    * Adjusted left margin for payment methods list
    
    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    adrienne-deriv and carolsachdeva committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    3d8078e View commit details
    Browse the repository at this point in the history
  9. Bala/Dx trade service token (binary-com#4915)

    * chore: integrate dxtrade service token
    
    * chore: run prettify
    
    * refactor: download dxtrade functions
    
    * add dxtrade_tokens type
    
    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    balakrishna-deriv and carolsachdeva committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    bd7668d View commit details
    Browse the repository at this point in the history
  10. Bala/regenerate package lock (binary-com#5851)

    * chore: regenerate package lock
    
    * chore: remove package-lock in p2p
    
    Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
    balakrishna-deriv and carolsachdeva committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    4fd234b View commit details
    Browse the repository at this point in the history
  11. translations: 📚 sync translations with crowdin (binary-com#5870)

    Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
    github-actions[bot] and DerivFE committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    9487490 View commit details
    Browse the repository at this point in the history
  12. Notify about Cloudflare pages deriv.com deployment (binary-com#5821)

    Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com>
    thibault-deriv and balakrishna-deriv committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    5f7e1e9 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    9c390cb View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. temporary solution closing account link (binary-com#5872)

    Co-authored-by: balakrishna-binary <56330681+balakrishna-binary@users.noreply.github.com>
    carolsachdeva and balakrishna-deriv committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    3c1d1d1 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Configuration menu
    Copy the full SHA
    f9fed33 View commit details
    Browse the repository at this point in the history
  2. Maryia/fix: tests

    maryia-deriv committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    a47ff50 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6bb2b88 View commit details
    Browse the repository at this point in the history