Skip to content

Commit

Permalink
Resolve conflicts improvement dbot tutorials (binary-com#9983)
Browse files Browse the repository at this point in the history
* henry/webrel-1160/hotfix: space issue dropdown (binary-com#9898)

* fix: space issue dropdown

* fix: resolve comment

* fix: comment

* Update packages/components/src/components/dropdown/dropdown.scss

* fix: empty commit

---------

Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com>

* fix: overwritten styles (binary-com#9899)

* fix: overwritten styles

* fix: overwritten styles

* Ameerul /WEBREL-1159 Sort by column alignment in P2P Buy/Sell page is off (binary-com#9876)

* chore: fixed sort dropdown alignment

* chore: changed styling for dropdown

* george / PRODQA-1316 / Transfer from Tradershub validation (binary-com#9908)

* fix: πŸš‘ fix active container for TH transfer, fix insufficient balance check

* test: πŸ› fix tests

* fix: πŸš‘ fix 'Insufficient balance' condition

* translations: πŸ“š sync translations with crowdin (binary-com#9912)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (binary-com#9917)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* Hirad-Hamza-ShonTzu/Feature revamp compare account re-deployment (binary-com#9611)

* feat: initializing the compare account implementation

* feat: icon reusable component v1.0

* feat: icon reusable component v1.1

* feat: icon reusable component v1.1.1

* feat: initialize compare cfd account page (todo:css)

* feat: blank compare cfd accounts page & navi done

* feat: mobile view

* fix: compare-accounts naming convention

* fix: updated path import

* fix: reverted icons.js changes

* fix: compare-cfds -> compare-accounts

* feat: reusable component v1.2

* feat: reusable component v1.2.1

* feat: icon reusable component added v1.3

* feat: reusable component for Icons

* feat: reusable component for Icons refactor

* feat: reusable component for Icons refactor v1.2

* feat: description div added

* feat: description with title +icon is added

* feat: platform label + icon component padding added

* chore: labuan leverage updated

* chore: css issue fixed for Cards

* feat: carousel added with sorting o f MT5 accounts

* feat: carousel arrow background and container added

* chore: added dxtrade in the card for dynamic rendering with type fixes

* chore: changes in platform label header with respect to props data

* chore: icons updated because of white line issue in icons

* chore: change the components css name and other naming convention tweaks

* refactor: suggestions implemented

* refactor: convert carousel button into one

* feat: initial commit for starting collaboration

* feat: added the button placeholder

* feat: added new banner to cfd cards

* refactor: make the banner smaller

* fix: added condition to show banner for derivez and ctrader only

* refactor: changed the types and applied suggestions

* refactor: removed the invalide shortcode for dxtrade

* refactor: round up patches based on reviews

* fix: round up patch 2 based on review

* Update packages/cfd/src/Containers/cfd-compare-accounts/cfd-compare-accounts.scss

Co-authored-by: Muhammad Hamza <120543468+hamza-deriv@users.noreply.github.com>

* refactor: button width

* refactor: button classname

* chore: fix css of underline

* chore: added redirection to homepage in case of modals

* fix: circle ci failed due to wrong type of client function

* chore: added the disabled property for the Added accounts

* chore: added condition for the dxtrade

* chore: rearrange block scoped variables

* chore: fix css of labuan tooltip with removal of commented code

* chore: responsive view fixes

* feat: demo accounts added for low risk

* feat: demo accounts label added and swap-free account creation fixed

* chore: added derivx account creation flow

* refactor: replace ternary operators with if-else

* chore: remove unused jurisdiction

* feat: demo account compare implemetation tweaks as per design

* feat: rectified the Demo title as per design

* chore: font weigth of instruments as per design

* feat: Eu flow for DIEL

* feat: changes in the icons label and correction in EU flow

* chore: addded translations demo title and rename baskets

* chore: rename icon type

* chore: final changes prop drilling instead of observer EU flow finalized

* fix: hidding deriv ez

* fix: EU flow platform label change

* feat: test case for description added

* feat: platform label test case added

* feat: title icon test case added

* feat: title icon test case added

* chore: fix test case description + instruments icon test added

* refactor: blank spaces removed

* chore: cfd-instruments-label test added

* chore: test file added cfd-instrument-label

* feat: button partial test case added

* chore: added more test case for Button component

* feat: added test case for compare-account-card

* chore: merge conflicts

* chore: test for cfd-compare-accounts added

* feat: derivX demo

* chore: added testcase for dxtrade in button

* fix: dxtrade for australian clients

* fix: swapfree account creation added

* fix: comapre account fixes first round

* fix: remove the css because scroll not working

* fix: renamed variable + icons

* fix: cursor not allowed on instrument icons

* fix: fixed the circle ci issue

* fix: fixed one of our test issues

* refactor: review comments resolved

* fix: changing the text of mf accounts to pass the tests

* fix: made changes according to suggestions

* fix: made changes according to suggestions

* fix: fixed the test case issues

* chore: added s to spread(s)

* chore: fixed capitalization

* chore: line split

* fix: failing test case

* fix: updated markets offerings for MT5 Financial Labuan

* fix: Other CFDs --> Other CFDs Platform

* fix: removed standard/micro from DerivX Forex label

* refactor: optimised code

* fix: icon size inconsistencyn mobile VP

* refactor: css refactoring to reflect figma as much as possible

* refactor: minor css fixes

* fix: fixed

* style: added bottom padding for mobile

* fix: fixed the build issue

* chore: re running the tests

* fix: subtasks

* chore: typo

* style: position the tooltip to be center within the card

* style: resize width for word-wrap

* chore: d and r should be lowercase dispute and resolution

* fix: fixing sonar cloud issues

* fix: making changes to pass the tests

---------

Co-authored-by: hamza-deriv <hamza.muhammad@regentmarkets.com>
Co-authored-by: shontzu-deriv <shon.tzu@regentmarkets.com>
Co-authored-by: shontzu <108507236+shontzu-deriv@users.noreply.github.com>
Co-authored-by: Muhammad Hamza <120543468+hamza-deriv@users.noreply.github.com>

* adrienne/chore: added eslint and stylelint for wallets and renamed css variables (binary-com#9877)

* feat: added stylelint for wallets for bem convention

* feat: added stylelint for wallets for bem convention

* chore: added import sorts for wallets and bem convention checking

* chore: removed unused dependencies in wallets

* Arshad/Matin/WALL-1226/Dynamic leverage for MT5 financial accounts (binary-com#9314)

* chore: Dynamic leverage for MT5 financial accounts initial commit

* feat: 🚧 dynamic leverage modal

* test: unit tests

* feat: βœ… added unit tests and refactoring

* feat: ♻️ fixed UI

* feat: ♻️ review changes for dynamic leverage

* chore: item name update

* feat: πŸ› passed string to localize instead of a variable

* test: ♻️

* refactor: ♻️ refactored column header to new component

* refactor: refactored code

* fix: fixed styling and refactored code

* style: formatted code

* test: updated test mock component

* refactor: refactored styling and unit tests

* fix: fixed text content for dynamic leverage

* fix: fixed localize component usage

* refactor: used strong instead of span styling

* fix: jurisdiction card layout

---------

Co-authored-by: arshad-rao-deriv <muhammad.arshad@deriv.com>
Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (binary-com#9924)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (binary-com#9925)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* translations: πŸ“š sync translations with crowdin (binary-com#9930)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* Ako/remove docker k8s config (binary-com#9933)

* ci: remove k8s workflow

* ci: remove docker build and  push workflow

* fix: regression bug regarding market offerings (binary-com#9936)

* FarhanNurzi/WALL-1657/Link the Wallet carousel with real data in Responsive (binary-com#9895)

* chore: use hook to get wallet list in mobile carousel

* chore: add components/index.ts

* thisyahlen/refactor: add useAvailableWallets in deriv/api (binary-com#9818)

* chore: add useAvailableWallets in deriv/api

* fix: empty

* refactor(api): ♻️ clean-up

* fix: latest code for available wallets

* fix: rename useGetAccountTypes

* fix: comments

* chore: split function and refactor

* fix: sonarcloud

---------

Co-authored-by: Farzin Mirzaie <farzin@deriv.com>

* thisyahlen/chore: update ui for wallet header (binary-com#9870)

* chore: update ui for wallet header

* chore: add more styles

* chore: add more styles v2

* fix: lint errors

* chore: split components

* chore: split v2

* chore: split v3

* chore: add svg for header button actions

* fix: format balance and css styles

* fix: landing company name uppercase

* fix: comments

* chore: split moreeeee

* fix: rename css

* fix: lint styles

* fix: styles

* fix: comments

* fix: comments v3

* fix: comments v4

* fix: comments v5

* Hamza/ hotfix: compare account text size difference (binary-com#9950)

* chore: compare account text size difference

* chore: compare account text size difference on mobile

* translations: πŸ“š sync translations with crowdin (binary-com#9945)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* Mahdiyeh/fix: change market price movements to market movements (binary-com#9341)

* fix: change market price movements to market movements

* fix: resolve issue

---------

Co-authored-by: Mahdiyeh Amirkhani <mahdiyehamirkhani@Mahdiyeh-Amirkhanis-Mac-J79XQHKXVJ.local>

* fix:  cashier page height in iphone (binary-com#9779)

* shahzaib / KYC-304 / additional kyc questions in the real account creation (binary-com#9501)

* chore: additional information section for real accounts creation

* chore: hide additional details for high risk client

* chore: refactor to pass classname conditionally and removed disposable props

* chore: removed unused props

* chore: renamed className to class_name

* chore: update test case for personal-details component

* Update packages/account/src/Components/personal-details/__tests__/personal-details.spec.js

Co-authored-by: yauheni-deriv <103182683+yauheni-deriv@users.noreply.github.com>

* Update onfido-container.scss

Co-authored-by: yauheni-deriv <103182683+yauheni-deriv@users.noreply.github.com>

* chore: update props

Co-authored-by: yauheni-deriv <103182683+yauheni-deriv@users.noreply.github.com>

* chore: update props

Co-authored-by: yauheni-deriv <103182683+yauheni-deriv@users.noreply.github.com>

* chore: remove unused imports

* chore: update fragment useage

* chore: remove high_risk conditiono to hide the additional fields

* chore: empty commit

* fix(props): removed unused is_high_risk prop

* chore: renamed TaxResidentField

* chore: update tax residence validation message for TIN number

* chore: update config to include additional details if the client is not high risk for mt5

* chore: added test case for high risk condition in personal details config

* chore: refactored test case

* chore: disble additional information fields if user has already filled the details

* feat(hooks): created hooks to get if a user is high risk for MT5

* chore: updated comment for personal details config

* fix: remove unused variable

* fix(test): update test cases to reflect hook change

* test: update test cases to use store provider

* chore: removed unused logic from cfd & traders hub store

* test: update description

* test: mock hook for returned value

* fix: TIN validation in personal-details-config

* fix: added additional field check for diel accounts

---------

Co-authored-by: yauheni-deriv <103182683+yauheni-deriv@users.noreply.github.com>

* Rupato/PRODQA-1167/fix: updated error handling for dbot skeleton (binary-com#9576)

* fix: updated error handling for dbot skeleton

* fix: changed method naming

* fix: changed comment

* fix: changed error config

* fix: changed error config

* fix: review comments

* fix: changed keycode

* fix: assigned const

* fix: bug fixes

* fix: for multipliers block

* fix: removed extra space

* fix: added parameter

* fix: for localize

* fix: sentence

* fix: updated error messages

* fix: removed fallback

* fix: removed check for mandatory block

* fix: review comments

* fix: empty trigger

* fix: code refactored and added disabled check

* fix: removed key

* fix: removed key

* fix: changed error message

* fix: reverted changes for disabled block and misplaced

* fix: removed commented code

* fix: review comments

* fix: review comments

* fix: review comments

* chore: updated z-index for language switcher (binary-com#9461)

* farabi/bot-512/tour content sizing and responsiveness on small screen (binary-com#9472)

* fix: updated content size according to design

* refactor: reverted classname changes

* fix: tour is made responsive on smaller screen

* Shafin/bot 301/fix  preview delete save edit issue (binary-com#9549)

* chore: investigation on strategy save, edit, delete issue

* chore: finalize save-delete-edit issue for preview strategies

* fix: don't load if workspace is not present

* fix: pass parent element to mutation observer for least computation

* fix: issues on quick strategy run

* Vinu/bot 92/ticks history refactor (binary-com#9547)

* fix: ticks_history call outside the run

* fix: remove console error and make ticks_history call on load

* refactor: remove unecessary code

* fix: added condition to make ticks_history call

* fix: disable run button untill ticks_history call is received

* fix: change trade_type_category,trade_type_category_field in trade_definition_tradetype onchange

* fix: fix ticks_history error when market is closed

* fix: fix the ticks_history call when bot is terminated

* fix: change file accept format (binary-com#9812)

* fix: change file accept format

* fix: update file acceptance for dashboard file input

* Hamza/chore: useCreateOtherCFDAccount and useCreateMT5Account hooks added (binary-com#9941)

* chore: useCreateOtherCFDAccount and useCreateMT5Account hooks added

* chore: added comments for explanantion purpose

* fix: allow custom variables and function values for limit order (binary-com#9490)

* chore: fix language not correct when redirect from deriv-com (binary-com#9632)

* chore: fix language not correct when redirect from deriv-com

* chore: fix language redirection from deriv-com

* chore: add optional chaining

* chore: update code base on comments

---------

Co-authored-by: henry-deriv <118344354+henry-deriv@users.noreply.github.com>
Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com>
Co-authored-by: Hamid <hamid@regentmarkets.com>
Co-authored-by: ameerul-deriv <103412909+ameerul-deriv@users.noreply.github.com>
Co-authored-by: George Usynin <103181646+heorhi-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: hirad-deriv <hirad@re-work.dev>
Co-authored-by: hamza-deriv <hamza.muhammad@regentmarkets.com>
Co-authored-by: shontzu-deriv <shon.tzu@regentmarkets.com>
Co-authored-by: shontzu <108507236+shontzu-deriv@users.noreply.github.com>
Co-authored-by: Muhammad Hamza <120543468+hamza-deriv@users.noreply.github.com>
Co-authored-by: adrienne-deriv <103016120+adrienne-deriv@users.noreply.github.com>
Co-authored-by: Matin shafiei <matin@deriv.com>
Co-authored-by: arshad-rao-deriv <muhammad.arshad@deriv.com>
Co-authored-by: mahdiyeh-deriv <82078941+mahdiyeh-deriv@users.noreply.github.com>
Co-authored-by: Ali(Ako) Hosseini <ali.hosseini@deriv.com>
Co-authored-by: Farhan Ahmad Nurzi <125247833+farhan-nurzi-deriv@users.noreply.github.com>
Co-authored-by: thisyahlen <104053934+thisyahlen-deriv@users.noreply.github.com>
Co-authored-by: Farzin Mirzaie <farzin@deriv.com>
Co-authored-by: Mahdiyeh Amirkhani <mahdiyehamirkhani@Mahdiyeh-Amirkhanis-Mac-J79XQHKXVJ.local>
Co-authored-by: Shahzaib <shahzaib@deriv.com>
Co-authored-by: yauheni-deriv <103182683+yauheni-deriv@users.noreply.github.com>
Co-authored-by: rupato-deriv <97010868+rupato-deriv@users.noreply.github.com>
Co-authored-by: Sui Sin <103026762+suisin-deriv@users.noreply.github.com>
Co-authored-by: Farabi <102643568+farabi-deriv@users.noreply.github.com>
Co-authored-by: Shafin Al Karim <129021108+shafin-deriv@users.noreply.github.com>
Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com>
Co-authored-by: prince-deriv <82309725+prince-deriv@users.noreply.github.com>
Co-authored-by: Sandeep <sandeepsingh@Sandeeps-Mac-CX9PCJX3L9.local>
  • Loading branch information
1 parent d264663 commit b4c8405
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit b4c8405

Please sign in to comment.