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

negar/add_user_id #151

Merged
merged 2 commits into from
Jun 12, 2019
Merged

negar/add_user_id #151

merged 2 commits into from
Jun 12, 2019

Conversation

negarn
Copy link
Contributor

@negarn negarn commented Jun 12, 2019

send userId

@ashkanx ashkanx merged commit 0be6200 into binary-com:dev Jun 12, 2019
@negarn negarn deleted the negar/add_user_id branch June 12, 2019 06:42
jim-deriv pushed a commit to jim-deriv/deriv-app that referenced this pull request Jan 20, 2023
…_in_acc_currency

Amina/ fix: mf currency switcher
kate-deriv added a commit to kate-deriv/deriv-app that referenced this pull request Jul 18, 2024
* feat: add tests for purchase buttom content file

* refactor: add tests for purchase button file

* refactor: change content for multipliers description

* refactor: add tests for trade type tabs file

* refactor: add tests for trade parameters container file

* refactor: add tests for trade parameters file

* chore: add more test cases

* chore: add mockcontractinfo function usage
balakrishna-deriv pushed a commit that referenced this pull request Jul 26, 2024
… buttons (#16032)

* chore: init branch

* Maryia/DTRA-1421/feat: add temporary Trade types selector (chips) & Assets dropdown (#137)

* feat: add trade types selector (chips)

* feat: add assets (dropdown)

* chore: use Dropdown for assets

* DTRA / Kate / DTRA-1422: Create initial layout for chart, trade params & purchase buttons (#136)

* feat: init layout

* refactor: make purchase button sticky

* feat: add dynamic chart height calculation

* refactor: css

* refactor: extract purchase button with trade params to a separate files

---------

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

* chore: fix: conflicts

* Maryia/DTRA-1423/feat: add config for all Trade types params + display components for Rise/Fall (#140)

* feat: add display components for Rise/Fall based on real data + config for trade params

* refactor: isolate trade params logic

* DTRA-1422/ Kate / Add scrolling bahaviour for trade params (#139)

* feat: add animation on scrolling

* refactor: improve animation

* refactor: pass trade params as children

* feat: add barrier trade param (#141)

* DTRA-1425 / Kate / Feat: add trade params for Accumulators contract (#142)

* feat: create take profit and growth rate trade params

* feat: add accumulators information trade param

* DTRA-1436 / Kate / Feat: add trade params for multipliers (#143)

* feat: add trade params for multipliers

* chore: change order to alhabetical one

* Maryia/DTRA-1427/feat: TradeTypeTabs and Strike display components (#144)

* feat: trade-type-tabs

* feat: Strike

* feat: PayoutPerPoint + refactoring (#146)

* fix: trade params config for Even/Odd

* DTRA-1424 / Kate / Enable purchase functionality (#145)

* refactor: customize amount of buttons and it name

* feat: add basis text and amount for button based on contract type

* refactor: purchase button

* feat: eanble purchase functionality

* feat: add sell functionality for acc button

* chore: add caption text from quill

* fix: add store init to bottomnav

* DTRA-1455 / Kate / Create state management for purchase button (#148)

* feat: create state management for purchase button

* chore: refactor comments

* Maryia/DTRA-1441/feat: add chart + display current spot for digit trade types (#149)

* feat: CurrentSpot init version

* fix: trade types & chart styles

* fix: trade page performance

* fix: use small localize for TextField labels to avoid app crash due to duplicate [object Object] ids

* chore: add skeleton while current spot is still updating

* fix: payout per point skeleton + refactor trade params list

* build: use version 1.13.16

* build: downgrade to quill-ui v1.13.13

* Maryia/DTRA-1441/feat: add last digit selector and expand displayed spot feature for digits (#150)

* feat: Last digit selector using bottomWidgets data from chart

* chore: digits params layout + refactoring

* feat: current spot display for ongoing contracts

* refactor: onScroll

* refactor: current-spot

* chore: wrap onScroll with useCallback

* DTRA-1487 / Kate / Add tests for new files (#151)

* feat: add tests for purchase buttom content file

* refactor: add tests for purchase button file

* refactor: change content for multipliers description

* refactor: add tests for trade type tabs file

* refactor: add tests for trade parameters container file

* refactor: add tests for trade parameters file

* chore: add more test cases

* chore: add mockcontractinfo function usage

* build: use master version of quill-ui

* DTRA-1469 / Kate / Implement Allow equals trade param and Carousel functionality (#153)

* feat: add allow equals main content and functionality

* feat: add carousel

* refactor: extracted carpusel into a separate component

* refactor: replace localize function with the component

* refactor: add variables for css

* refactor: add tests for carousel

* refactor: add test for allow equals

* chore: make id numbers

* DTRA / Kate / Refactoring: resetting style (#154)

* refactor: trading and contract details

* fix: reset button style in definition

* DTRA-1489 / Kate / Add tests (#155)

* refactor: add tests for trade

* refactor: add tests for trade param utils

* Maryia/DTRA-1491/feat: finalize LastDigitPrediction param + Current spot price animation (#152)

* feat: LastDigitPrediction stats mode

* chore: highlight min & max stats

* feat: Action sheet for LastDigitPrediction + border highlight for current spot

* fix: profit for cards in Closed tab

* feat: current spot animation for contract purchase + multiple contract purchase

* chore: improve animation + refactoring

* feat: finalize current spot animation

* refactor: address comments

* refactor: update quill ui and refactor carousel component (#156)

* DTRA-1354 / Kate / Refactor before submitting (#158)

* refactor: rename carousel prop

* refactor: add skeleton loader for video fargmenst

* DTRA-1354/ Kate / Tests for isDigitContractWinning function  (#160)

* refactor: add tests for util function

* fix: test case

* Maryia/DTRA-1491/test: last digit selector & current spot (#157)

* test: packages/trader/src/AppV2/Components/CurrentSpot/current-spot.tsx

* test: CurrentSpotDisplay

* refactor: tests

* refactor: address review comments

* test: LastDigitPrediction

* refactor: remove unused import

* test: LastDigitSelector

* test: Digit

* test: setDigitStats & setDigitTick in trade-store

* refactor: current-spot

* fix: cannot find name_plural of undefined

* chore: apply suggestions

* chore: address review comments

* fix: bottom layout

* refactor: add button type function

* chore: improve animation + apply suggestion for prev_contract

* feat: integrate v2 assets component

* test: fix tests that failed after assets v2 integration

* fix: console error

* fix: console error for trade params label

* refactor: update quill ui lib

* refactor: add dvh (#161)

* fix: video loading style

* feat: make active_symbols API call based on the selected contract_type + quill-ui components fixes

* refactor: active_symbols_v2 to has_symbols_for_v2

---------

Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com>
Co-authored-by: kate-deriv <kate@regentmarkets.com>
amina-deriv added a commit that referenced this pull request Jul 26, 2024
* chore: use states instead of useRef and update testcase

* test: added testcases for the hook

* chore: add phone otp screen

* chore: update based on comments

* chore: remove unused store in test case

* chore: add sms and whatsapp to 1 constant file

* chore: update code based on comments

* test: add tescases for counter change and title change

* chore: update code based on comments

* test: use useRealTimers

* test: mock useGetPhoneNumberOTP

* chore: update TODO comments

* chore: update code

* chore: update function for WhatsApp display

* chore: fix test case fail for confirm-phone-number

* chore: resolve failling test case

* chore: resolve conflicts otp-verification-component

* fix: prettier issue scss format

* chore: add phone verification successful modal

* chore: edit classname for verified modal

* chore: update test case describe name and ui store value

* chore: move successful modal inside phone-number-verification-page

* chore: update phone-number-verified-modal and remove ui store values

* chore: revert unused changes

* chore: add routes to personal details

* chore: fix matchMedia failling in test case

* chore: update test case title

* chore: replace modal with quill-ui modal

* chore: update test case to pass first for phone number verified modal

* fix: test case

* chore: update code base on comments

* chore: resolve integration test failling

* chore: update code based on comments

* chore: add didnt get the code modal for phone verification

* chore: update test case and files for didnt get the code modal

* chore: update code based on comments

* chore: update test case based on comments

* chore: update helpers.ts based on comments

* chore: update based on comments

* chore: move convertPhoneTypeDisplay to correct folders

* chore: update resend-code-timer test case to use jest.advanceTimer

* chore: update show to show_otp_verification

* chore: update to use localise function

* chore: create verification-link-expired-modal

* chore: update all quill-ui packages

* chore: update test case title

* chore: update package version for quill-ui

* chore: create useGetEmailVerificationOTP hooks

* chore: implement callback for hooks

* chore: try to add InputGroupButton for phone-verification

* chore: update code based on comments

* chore: remove useGetEmailVerificationOTP and use useVerifyEmail instead

* chore: remove Input field from component and use quill-ui TextField and InputGroupButton

* chore: update scss

* chore: fix test failing for resend-code-timer.spec.tsx

* chore: implement phone number otp api hooks

* chore: update test case for useSendOTPVerificationCode

* chore: update otp-verification.spec.tsx

* chore: update title for otp verification and add test for Phone number verified modal

* chore: update naming to is_phone_number_verified based on comment

* chore: update localize in hooks

* fix: type error

* chore: resolve build fail issue

* chore: add localize at useSendOTPVerificationCode

* chore: implement error status when phone number is invalid

* chore: fix test case for confirm phone number

* chore: rename test case title and hooks based on comment

* chore: moved validePhoneNumber to a constant file

* chore: add error screens for email otp invalid

* chore: remove unused package in hooks

* chore: added useSetSettings hooks and change logic using new implemented hooks

* chore: update test case and localStorage setItem

* chore: rename handleError to formatError

* chore: change useSetSettings to useSettings and modify the hooks

* chore: update based on comments

* chore: remove conditional check for handleError and make it into 2 different formatError

* chore: include comments in hooks for requestSMS and requestWhatsapp

* chore: update useSEndOTPVerificationCode test case

* chore: add routing from email verification link

* chore: remove comments

* chore: implement timer from BE

* chore: update code based on comment

* chore: use 1 useState for otp request

* chore: move to 1 useState based on comment

* chore: rename phone_number_verification and move setIsLoading in if else statement based on comment

* chore: move setTimer useState into otp-verification

* chore: need to use React.useCallback to solve blinking issue for reInitalizeGetSettings

* chore: remove setIsButtonDisabled in validate next_email_otp_request function

* chore: update code based on comments

* chore: update to use is_email_verified

* chore: add WS call when redirect from notification tray

* chore: remove unused comment

* chore: update quill-ui in package.json

* chore: added Math.round for minutes timer

* chore: update code to have better user flow

* chore: realign code for BE integration

* chore: add timer to personal-details, expired modal and notification

* chore: remove unused dayjs in account package

* chore: update quill-ui version and updated codes for expired-link-modal

* chore: update verification link expired modal

* chore: add timer countdown snackbar in confirm your phone number page

* chore: update commented paragraph and remove TODOs

* chore: update test case and remove ts-expect-error

* chore: remove unused ...rest

* chore: include !! to phone_number_verification.verified

* chore: update verify button to clear all possible stored value

* chore: update code to fix demo session bugs

* chore: remove is_mobile from ui-store and update to latest useDevice

* chore: fix test case failling and update code based on comments

* chore: remove phone_number_verify?.verified logic check in personal details

* chore: fix test case and remove unused imports

* chore: update to fix test case

* chore: update code based on comments

* chore: update test case

* chore: update code based on comments

* chore: revert icons file

* chore: update code based on comments

* chore: update packages version and fix useSetting based on comments

* chore: update code based on comments

* chore: update verify-button.spec.tsx based on comment

* chore: update quill-ui version and code based on comments

* chore: update positions test case with scrollTo fix

* chore: remove @ts-expected-error

* fix: console log verified not found issue and clear otp after click resend code

* chore: fix authorize issue

* chore: update quill-ui version for console log fix

* chore: fix verification link expired rerendering issue

* fix: clicks on resend link or send via whatsapp redirect user back to confirm phone number page

* chore: have to include color black in button so the underline will be black

* chore: update quill-ui version

* chore: update to include type number in InputGroupButton

* chore: update useVerifyEmail hooks to fix button disabled issue

* chore: should run timer also if error is returned from BE

* fix: console error on clicking verify button in personal details section

* chore: fix unmounted console log issue

* chore: use useEffect directly from react package

* chore: fix test case fail issue

* chore: fix link-expired-modal cause added a boolean value in the hooks

* chore: replace TextField with TextFieldAddOn for confirm your phone number page

* chore: create new functional call in useVerifyEmail and remove deprecated tag

* chore: fix console log issue after clicking on verify button

* fix: legacywonicon not displaying properly by updating the version

* chore: update quill-ui version to fix input validation issue

* chore: update quill-ui verison to fix dark mode + issue

* chore: use lazyLoading for phone number verification

* chore: fix verify-button test case based on comment

* chore: update codes based on comment

* fix: resolve conflicts

* chore: revert phone number verification changes with master

* chore: make verify button disabled once user edit personal details and added growthbook

* chore: scss changes to fix tablet view issue

* chore: hide notification and show demo message when user is in demo account

* chore: implement growthbook in AppContent and added client store for it

* chore: change to redirect user back to personal details once they switch to demo

* chore: move popover tablet view from right to top

* chore: hide verify button when phone number changes

* chore: update growthbook usage based on comment

* chore: update useEffect in AppContent

* Rupato/BOT-2013/fix: added missing translations for blockly context menu (#16156)

* fix: added missing translations for blockly context menu

* fix: added translations missing blocks

* translations: 📚 sync translations with crowdin (#16159)

Co-authored-by: DerivFE <fe-access@regentmarkets.com>

* Aswathy/CRO-675/feat: added the residence in the analytics (#16147)

* feat: added the residence in the analytics

* feat: updated the analytics version

* feat: updated the analytics version

* [DTRA] Henry/dtra 1353/available assets trader v2 (#15776)

* fix: implement isSearching functionality

* fix: active symbol hook

* fix: add symbol not found component

* fix: sanitize activeSymbols response

* fix: categorize symbols and render by categories on action sheet

* fix: map symbol icons

* fix: implement market selection and default market selection

* fix: handle light/dark theme select markets

* fix: fetch active symbol by contract type

* fix: add favorites

* fix: working favorite section

* fix: rename to appropriate name and setup search

* fix: addsnackbar

* fix: make search functionality work

* fix: rename to appropirate name

* fix: upgrade quill-ui and sanity some styling

* fix: fix active symbols list scrolling bug

* fix: overflow issue

* fix: set trade store symbol

* fix: merge master

* fix: contract categories scroll behavior

* fix: bump quill-ui version

* fix: handle snackbar fill for themes

* fix: add correct logo colors

* fix: rename component

* fix: change magic numbers to a quill token

* fix: make sure that symbol category works with different langauages

* fix: add new variables to mockStore

* fix: add tests

* fix: unnecessary comment

* fix: clean up

* fix: remove comment

* fix: memoize hooks

* fix: resolve comments and rename css classnames

* fix: simplify logic

* fix: separate out favorite logic to separate store

* fix: move marketIcons to a utility file

* fix: resolve comments

* fix: add test for markets-store

* fix: move scrolling logic/state into symbolssearchfield to prevent parent rerendering when scroll

* fix: update package-lock

* fix: update package lock

* fix: revert package-lock

* fix: resolve comments

* fix: type change

* fix: handle isOpen state properly

* [WALL-3737] deriv-api removal (#15926)

* feat: squashed deriv-api removal

* feat: test fix

* feat: minor typing update

* [WALL] Jim | Aum /WALL-4459/eliminate balance prop drilling using observer (#15767)

* chore: rename hook

* chore: check for initial render and refetch and add mocks to component tests

* chore: add usd as the fallback cyrrency

* style: fix typo

* chore: address review comments

* ci: fix eslint error

* ci: trigger build

* chore: update @deriv/deriv-charts to 2.1.25 (#16176)

Co-authored-by: balakrishna-deriv <balakrishna-deriv@users.noreply.github.com>

* Suisin/chore: add Khmer language into deriv-app (#15714)

* chore: add Khmer language into deriv-app

* chore: update deriv-com/translations package version

* Merge branch 'master' of github.com:binary-com/deriv-app into suisin/UPM1116/add_khmer_language

* chore: update km.json file

* chore: update quill-icons version and remove korean constant flag

* chore: update km.json file

* chore: add KM tag in initmoment so that time does not get translated

* chore: empty commit

* chore: update km.json files

* chore: remove comments for p2p i18next

* chore: fix bots toast notification issue

* chore: update khmer strings

* chore: strings to fix translation issue

* chore: update km.json strings

* chore: update km json strings

* fix: version

* fix: remove unused imports

---------

Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>

* [WALL] Jim/WALL-4588/fix failing tests (#16188)

* fix: fix failing tests

* chore: add mockbalance

* translations: 📚 sync translations with crowdin (#16189)

Co-authored-by: DerivFE <fe-access@regentmarkets.com>

* [WALL] Jim/WALL-4588/update expectations and conditional (#16183)

* chore: update expectations and conditional

* chore: add isSubscribed to conditional

* chore: update ref name

* chore: fixed console error by adding useeffect (#16109)

* [WALL] Aizad/WALL-4353/ Replace Tooltip with Tooltip from deriv-com/ui (#15966)

* chore: update ui package to the latest changes

* chore: replacing tooltip within MT5TradeModal

* chore: replace existing tooltip component with the one from deriv/ui

* chore: replace tooltip componet within cashier with deriv-com/ui

* chore: Remove tooltip component from Wallets package

* chore: replace TransactionsPendingRowField with tooltip from deriv/ui

* chore: rename component according to file

* chore: fix test cases

* chore: fix version for analytics

* chore: update ui version updates and make changes to existing implementations

* chore: update tooltip inside of transactionspendingrow component

* chore: rerun pr

* chore: rerun proecesses

* chore: update code

* Fasih/TRAH-3827/ Enable tooltip again (#16175)

* Revert "Fasih/TRAH-3793/ Removed popup (#16048)"

This reverts commit 06d5e1a.

* chore: imported URL from external URL file

* chore: fixed build issue

* [WALL] Jim/WALL-4349/replace walletbutton with button (#16146)

* refactor: replace walletbutton with button

* chore: update package and fix component test

* chore: add package-lock

* [DTRA] henry/dtra-1448/enable-landscape-blocker-dtrader (#16119)

* fix: test

* fix: show blocker for dtrader mobile landscape view

* fix: add console log for browserstack

* fix: remove logic that was blocking on tablet

* fix: remove console log

* fix: console.log

* fix: remove ipad from checking for mobileOS

* fix: add checkfor android mobile check

* fix: console log useragent

* fix: put exclusive check for mobile when os is android

* fix: remove console log

* fix: remove mobile from regex

* fix: change link filtering logic

* fix: add blocker for reports and contract details

* fix: add blocker for reports and contract details

* [DTRA] Kate/Maryia/DTRA-1354/feat: Redesigned Trade params & Purchase buttons (#16032)

* chore: init branch

* Maryia/DTRA-1421/feat: add temporary Trade types selector (chips) & Assets dropdown (#137)

* feat: add trade types selector (chips)

* feat: add assets (dropdown)

* chore: use Dropdown for assets

* DTRA / Kate / DTRA-1422: Create initial layout for chart, trade params & purchase buttons (#136)

* feat: init layout

* refactor: make purchase button sticky

* feat: add dynamic chart height calculation

* refactor: css

* refactor: extract purchase button with trade params to a separate files

---------

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

* chore: fix: conflicts

* Maryia/DTRA-1423/feat: add config for all Trade types params + display components for Rise/Fall (#140)

* feat: add display components for Rise/Fall based on real data + config for trade params

* refactor: isolate trade params logic

* DTRA-1422/ Kate / Add scrolling bahaviour for trade params (#139)

* feat: add animation on scrolling

* refactor: improve animation

* refactor: pass trade params as children

* feat: add barrier trade param (#141)

* DTRA-1425 / Kate / Feat: add trade params for Accumulators contract (#142)

* feat: create take profit and growth rate trade params

* feat: add accumulators information trade param

* DTRA-1436 / Kate / Feat: add trade params for multipliers (#143)

* feat: add trade params for multipliers

* chore: change order to alhabetical one

* Maryia/DTRA-1427/feat: TradeTypeTabs and Strike display components (#144)

* feat: trade-type-tabs

* feat: Strike

* feat: PayoutPerPoint + refactoring (#146)

* fix: trade params config for Even/Odd

* DTRA-1424 / Kate / Enable purchase functionality (#145)

* refactor: customize amount of buttons and it name

* feat: add basis text and amount for button based on contract type

* refactor: purchase button

* feat: eanble purchase functionality

* feat: add sell functionality for acc button

* chore: add caption text from quill

* fix: add store init to bottomnav

* DTRA-1455 / Kate / Create state management for purchase button (#148)

* feat: create state management for purchase button

* chore: refactor comments

* Maryia/DTRA-1441/feat: add chart + display current spot for digit trade types (#149)

* feat: CurrentSpot init version

* fix: trade types & chart styles

* fix: trade page performance

* fix: use small localize for TextField labels to avoid app crash due to duplicate [object Object] ids

* chore: add skeleton while current spot is still updating

* fix: payout per point skeleton + refactor trade params list

* build: use version 1.13.16

* build: downgrade to quill-ui v1.13.13

* Maryia/DTRA-1441/feat: add last digit selector and expand displayed spot feature for digits (#150)

* feat: Last digit selector using bottomWidgets data from chart

* chore: digits params layout + refactoring

* feat: current spot display for ongoing contracts

* refactor: onScroll

* refactor: current-spot

* chore: wrap onScroll with useCallback

* DTRA-1487 / Kate / Add tests for new files (#151)

* feat: add tests for purchase buttom content file

* refactor: add tests for purchase button file

* refactor: change content for multipliers description

* refactor: add tests for trade type tabs file

* refactor: add tests for trade parameters container file

* refactor: add tests for trade parameters file

* chore: add more test cases

* chore: add mockcontractinfo function usage

* build: use master version of quill-ui

* DTRA-1469 / Kate / Implement Allow equals trade param and Carousel functionality (#153)

* feat: add allow equals main content and functionality

* feat: add carousel

* refactor: extracted carpusel into a separate component

* refactor: replace localize function with the component

* refactor: add variables for css

* refactor: add tests for carousel

* refactor: add test for allow equals

* chore: make id numbers

* DTRA / Kate / Refactoring: resetting style (#154)

* refactor: trading and contract details

* fix: reset button style in definition

* DTRA-1489 / Kate / Add tests (#155)

* refactor: add tests for trade

* refactor: add tests for trade param utils

* Maryia/DTRA-1491/feat: finalize LastDigitPrediction param + Current spot price animation (#152)

* feat: LastDigitPrediction stats mode

* chore: highlight min & max stats

* feat: Action sheet for LastDigitPrediction + border highlight for current spot

* fix: profit for cards in Closed tab

* feat: current spot animation for contract purchase + multiple contract purchase

* chore: improve animation + refactoring

* feat: finalize current spot animation

* refactor: address comments

* refactor: update quill ui and refactor carousel component (#156)

* DTRA-1354 / Kate / Refactor before submitting (#158)

* refactor: rename carousel prop

* refactor: add skeleton loader for video fargmenst

* DTRA-1354/ Kate / Tests for isDigitContractWinning function  (#160)

* refactor: add tests for util function

* fix: test case

* Maryia/DTRA-1491/test: last digit selector & current spot (#157)

* test: packages/trader/src/AppV2/Components/CurrentSpot/current-spot.tsx

* test: CurrentSpotDisplay

* refactor: tests

* refactor: address review comments

* test: LastDigitPrediction

* refactor: remove unused import

* test: LastDigitSelector

* test: Digit

* test: setDigitStats & setDigitTick in trade-store

* refactor: current-spot

* fix: cannot find name_plural of undefined

* chore: apply suggestions

* chore: address review comments

* fix: bottom layout

* refactor: add button type function

* chore: improve animation + apply suggestion for prev_contract

* feat: integrate v2 assets component

* test: fix tests that failed after assets v2 integration

* fix: console error

* fix: console error for trade params label

* refactor: update quill ui lib

* refactor: add dvh (#161)

* fix: video loading style

* feat: make active_symbols API call based on the selected contract_type + quill-ui components fixes

* refactor: active_symbols_v2 to has_symbols_for_v2

---------

Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com>
Co-authored-by: kate-deriv <kate@regentmarkets.com>

* chore: update @deriv/deriv-charts to 2.2.0 (#16204)

Co-authored-by: balakrishna-deriv <balakrishna-deriv@users.noreply.github.com>

* [DTRA] Maryia/OPT-862/feat: update Step Indices config and icons (#15889)

* feat: add step 200, 500, update step with step 100

* chore: update shortcode pattern for STPRNG indices

* fix: shortcode pattern and shortcode.spec.ts

* chore: update pattern for getMarketInformation

* chore: update growthbook value in AppContent

---------

Co-authored-by: utkarsha-deriv <utkarsha@regentmarkets.com>
Co-authored-by: Tay Sui Sin <suisin@regentmarkets.com>
Co-authored-by: Sui Sin <103026762+suisin-deriv@users.noreply.github.com>
Co-authored-by: rupato-deriv <97010868+rupato-deriv@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DerivFE <fe-access@regentmarkets.com>
Co-authored-by: Aswathy-Deriv <96725617+aswathy-deriv@users.noreply.github.com>
Co-authored-by: henry-deriv <118344354+henry-deriv@users.noreply.github.com>
Co-authored-by: wojciech-deriv <141034155+wojciech-deriv@users.noreply.github.com>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: balakrishna-deriv <balakrishna-deriv@users.noreply.github.com>
Co-authored-by: fasihali-deriv <121229483+fasihali-deriv@users.noreply.github.com>
Co-authored-by: Aizad Ridzo <103104395+aizad-deriv@users.noreply.github.com>
Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com>
Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com>
Co-authored-by: kate-deriv <kate@regentmarkets.com>
amina-deriv added a commit that referenced this pull request Jul 26, 2024
* chore: add phone otp screen

* chore: update based on comments

* chore: remove unused store in test case

* chore: add sms and whatsapp to 1 constant file

* chore: update code based on comments

* test: add tescases for counter change and title change

* chore: update code based on comments

* test: use useRealTimers

* test: mock useGetPhoneNumberOTP

* chore: update TODO comments

* chore: update code

* chore: update function for WhatsApp display

* chore: fix test case fail for confirm-phone-number

* chore: resolve failling test case

* chore: resolve conflicts otp-verification-component

* fix: prettier issue scss format

* chore: add phone verification successful modal

* chore: edit classname for verified modal

* chore: update test case describe name and ui store value

* chore: move successful modal inside phone-number-verification-page

* chore: update phone-number-verified-modal and remove ui store values

* chore: revert unused changes

* chore: add routes to personal details

* chore: fix matchMedia failling in test case

* chore: update test case title

* chore: replace modal with quill-ui modal

* chore: update test case to pass first for phone number verified modal

* fix: test case

* chore: update code base on comments

* chore: resolve integration test failling

* chore: update code based on comments

* chore: add didnt get the code modal for phone verification

* chore: update test case and files for didnt get the code modal

* chore: update code based on comments

* chore: update test case based on comments

* chore: update helpers.ts based on comments

* chore: update based on comments

* chore: move convertPhoneTypeDisplay to correct folders

* chore: update resend-code-timer test case to use jest.advanceTimer

* chore: update show to show_otp_verification

* chore: update to use localise function

* chore: create verification-link-expired-modal

* chore: update all quill-ui packages

* chore: update test case title

* chore: update package version for quill-ui

* chore: create useGetEmailVerificationOTP hooks

* chore: implement callback for hooks

* chore: try to add InputGroupButton for phone-verification

* chore: update code based on comments

* chore: remove useGetEmailVerificationOTP and use useVerifyEmail instead

* chore: remove Input field from component and use quill-ui TextField and InputGroupButton

* chore: update scss

* chore: fix test failing for resend-code-timer.spec.tsx

* chore: implement phone number otp api hooks

* chore: update test case for useSendOTPVerificationCode

* chore: update otp-verification.spec.tsx

* chore: update title for otp verification and add test for Phone number verified modal

* chore: update naming to is_phone_number_verified based on comment

* chore: update localize in hooks

* fix: type error

* chore: resolve build fail issue

* chore: add localize at useSendOTPVerificationCode

* chore: implement error status when phone number is invalid

* chore: fix test case for confirm phone number

* chore: rename test case title and hooks based on comment

* chore: moved validePhoneNumber to a constant file

* chore: add error screens for email otp invalid

* chore: remove unused package in hooks

* chore: added useSetSettings hooks and change logic using new implemented hooks

* chore: update test case and localStorage setItem

* chore: rename handleError to formatError

* chore: change useSetSettings to useSettings and modify the hooks

* chore: update based on comments

* chore: remove conditional check for handleError and make it into 2 different formatError

* chore: include comments in hooks for requestSMS and requestWhatsapp

* chore: update useSEndOTPVerificationCode test case

* chore: add routing from email verification link

* chore: remove comments

* chore: implement timer from BE

* chore: update code based on comment

* chore: use 1 useState for otp request

* chore: move to 1 useState based on comment

* chore: rename phone_number_verification and move setIsLoading in if else statement based on comment

* chore: move setTimer useState into otp-verification

* chore: need to use React.useCallback to solve blinking issue for reInitalizeGetSettings

* chore: remove setIsButtonDisabled in validate next_email_otp_request function

* chore: update code based on comments

* chore: update to use is_email_verified

* chore: add WS call when redirect from notification tray

* chore: remove unused comment

* chore: update quill-ui in package.json

* chore: added Math.round for minutes timer

* chore: update code to have better user flow

* chore: realign code for BE integration

* chore: add timer to personal-details, expired modal and notification

* chore: remove unused dayjs in account package

* chore: update quill-ui version and updated codes for expired-link-modal

* chore: update verification link expired modal

* chore: add timer countdown snackbar in confirm your phone number page

* chore: update commented paragraph and remove TODOs

* chore: update test case and remove ts-expect-error

* chore: remove unused ...rest

* chore: include !! to phone_number_verification.verified

* chore: update verify button to clear all possible stored value

* chore: update code to fix demo session bugs

* chore: remove is_mobile from ui-store and update to latest useDevice

* chore: fix test case failling and update code based on comments

* chore: remove phone_number_verify?.verified logic check in personal details

* chore: fix test case and remove unused imports

* chore: update to fix test case

* chore: update code based on comments

* chore: update test case

* chore: update code based on comments

* chore: revert icons file

* chore: update code based on comments

* chore: update packages version and fix useSetting based on comments

* chore: update code based on comments

* chore: update verify-button.spec.tsx based on comment

* chore: update quill-ui version and code based on comments

* chore: update positions test case with scrollTo fix

* chore: remove @ts-expected-error

* fix: console log verified not found issue and clear otp after click resend code

* chore: fix authorize issue

* chore: update quill-ui version for console log fix

* chore: fix verification link expired rerendering issue

* fix: clicks on resend link or send via whatsapp redirect user back to confirm phone number page

* chore: have to include color black in button so the underline will be black

* chore: update quill-ui version

* chore: update to include type number in InputGroupButton

* chore: update useVerifyEmail hooks to fix button disabled issue

* chore: should run timer also if error is returned from BE

* fix: console error on clicking verify button in personal details section

* chore: fix unmounted console log issue

* chore: use useEffect directly from react package

* chore: fix test case fail issue

* chore: fix link-expired-modal cause added a boolean value in the hooks

* chore: replace TextField with TextFieldAddOn for confirm your phone number page

* chore: create new functional call in useVerifyEmail and remove deprecated tag

* chore: fix console log issue after clicking on verify button

* fix: legacywonicon not displaying properly by updating the version

* chore: update quill-ui version to fix input validation issue

* chore: update quill-ui verison to fix dark mode + issue

* chore: use lazyLoading for phone number verification

* chore: fix verify-button test case based on comment

* chore: update codes based on comment

* fix: resolve conflicts

* chore: revert phone number verification changes with master

* chore: make verify button disabled once user edit personal details and added growthbook

* chore: scss changes to fix tablet view issue

* chore: hide notification and show demo message when user is in demo account

* chore: implement growthbook in AppContent and added client store for it

* chore: change to redirect user back to personal details once they switch to demo

* chore: move popover tablet view from right to top

* chore: hide verify button when phone number changes

* chore: update growthbook usage based on comment

* chore: update useEffect in AppContent

* Rupato/BOT-2013/fix: added missing translations for blockly context menu (#16156)

* fix: added missing translations for blockly context menu

* fix: added translations missing blocks

* translations: 📚 sync translations with crowdin (#16159)

Co-authored-by: DerivFE <fe-access@regentmarkets.com>

* Aswathy/CRO-675/feat: added the residence in the analytics (#16147)

* feat: added the residence in the analytics

* feat: updated the analytics version

* feat: updated the analytics version

* [DTRA] Henry/dtra 1353/available assets trader v2 (#15776)

* fix: implement isSearching functionality

* fix: active symbol hook

* fix: add symbol not found component

* fix: sanitize activeSymbols response

* fix: categorize symbols and render by categories on action sheet

* fix: map symbol icons

* fix: implement market selection and default market selection

* fix: handle light/dark theme select markets

* fix: fetch active symbol by contract type

* fix: add favorites

* fix: working favorite section

* fix: rename to appropriate name and setup search

* fix: addsnackbar

* fix: make search functionality work

* fix: rename to appropirate name

* fix: upgrade quill-ui and sanity some styling

* fix: fix active symbols list scrolling bug

* fix: overflow issue

* fix: set trade store symbol

* fix: merge master

* fix: contract categories scroll behavior

* fix: bump quill-ui version

* fix: handle snackbar fill for themes

* fix: add correct logo colors

* fix: rename component

* fix: change magic numbers to a quill token

* fix: make sure that symbol category works with different langauages

* fix: add new variables to mockStore

* fix: add tests

* fix: unnecessary comment

* fix: clean up

* fix: remove comment

* fix: memoize hooks

* fix: resolve comments and rename css classnames

* fix: simplify logic

* fix: separate out favorite logic to separate store

* fix: move marketIcons to a utility file

* fix: resolve comments

* fix: add test for markets-store

* fix: move scrolling logic/state into symbolssearchfield to prevent parent rerendering when scroll

* fix: update package-lock

* fix: update package lock

* fix: revert package-lock

* fix: resolve comments

* fix: type change

* fix: handle isOpen state properly

* [WALL-3737] deriv-api removal (#15926)

* feat: squashed deriv-api removal

* feat: test fix

* feat: minor typing update

* [WALL] Jim | Aum /WALL-4459/eliminate balance prop drilling using observer (#15767)

* chore: rename hook

* chore: check for initial render and refetch and add mocks to component tests

* chore: add usd as the fallback cyrrency

* style: fix typo

* chore: address review comments

* ci: fix eslint error

* ci: trigger build

* chore: update @deriv/deriv-charts to 2.1.25 (#16176)

Co-authored-by: balakrishna-deriv <balakrishna-deriv@users.noreply.github.com>

* Suisin/chore: add Khmer language into deriv-app (#15714)

* chore: add Khmer language into deriv-app

* chore: update deriv-com/translations package version

* Merge branch 'master' of github.com:binary-com/deriv-app into suisin/UPM1116/add_khmer_language

* chore: update km.json file

* chore: update quill-icons version and remove korean constant flag

* chore: update km.json file

* chore: add KM tag in initmoment so that time does not get translated

* chore: empty commit

* chore: update km.json files

* chore: remove comments for p2p i18next

* chore: fix bots toast notification issue

* chore: update khmer strings

* chore: strings to fix translation issue

* chore: update km.json strings

* chore: update km json strings

* fix: version

* fix: remove unused imports

---------

Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>

* [WALL] Jim/WALL-4588/fix failing tests (#16188)

* fix: fix failing tests

* chore: add mockbalance

* translations: 📚 sync translations with crowdin (#16189)

Co-authored-by: DerivFE <fe-access@regentmarkets.com>

* [WALL] Jim/WALL-4588/update expectations and conditional (#16183)

* chore: update expectations and conditional

* chore: add isSubscribed to conditional

* chore: update ref name

* chore: fixed console error by adding useeffect (#16109)

* [WALL] Aizad/WALL-4353/ Replace Tooltip with Tooltip from deriv-com/ui (#15966)

* chore: update ui package to the latest changes

* chore: replacing tooltip within MT5TradeModal

* chore: replace existing tooltip component with the one from deriv/ui

* chore: replace tooltip componet within cashier with deriv-com/ui

* chore: Remove tooltip component from Wallets package

* chore: replace TransactionsPendingRowField with tooltip from deriv/ui

* chore: rename component according to file

* chore: fix test cases

* chore: fix version for analytics

* chore: update ui version updates and make changes to existing implementations

* chore: update tooltip inside of transactionspendingrow component

* chore: rerun pr

* chore: rerun proecesses

* chore: update code

* Fasih/TRAH-3827/ Enable tooltip again (#16175)

* Revert "Fasih/TRAH-3793/ Removed popup (#16048)"

This reverts commit 06d5e1a.

* chore: imported URL from external URL file

* chore: fixed build issue

* [WALL] Jim/WALL-4349/replace walletbutton with button (#16146)

* refactor: replace walletbutton with button

* chore: update package and fix component test

* chore: add package-lock

* [DTRA] henry/dtra-1448/enable-landscape-blocker-dtrader (#16119)

* fix: test

* fix: show blocker for dtrader mobile landscape view

* fix: add console log for browserstack

* fix: remove logic that was blocking on tablet

* fix: remove console log

* fix: console.log

* fix: remove ipad from checking for mobileOS

* fix: add checkfor android mobile check

* fix: console log useragent

* fix: put exclusive check for mobile when os is android

* fix: remove console log

* fix: remove mobile from regex

* fix: change link filtering logic

* fix: add blocker for reports and contract details

* fix: add blocker for reports and contract details

* [DTRA] Kate/Maryia/DTRA-1354/feat: Redesigned Trade params & Purchase buttons (#16032)

* chore: init branch

* Maryia/DTRA-1421/feat: add temporary Trade types selector (chips) & Assets dropdown (#137)

* feat: add trade types selector (chips)

* feat: add assets (dropdown)

* chore: use Dropdown for assets

* DTRA / Kate / DTRA-1422: Create initial layout for chart, trade params & purchase buttons (#136)

* feat: init layout

* refactor: make purchase button sticky

* feat: add dynamic chart height calculation

* refactor: css

* refactor: extract purchase button with trade params to a separate files

---------

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

* chore: fix: conflicts

* Maryia/DTRA-1423/feat: add config for all Trade types params + display components for Rise/Fall (#140)

* feat: add display components for Rise/Fall based on real data + config for trade params

* refactor: isolate trade params logic

* DTRA-1422/ Kate / Add scrolling bahaviour for trade params (#139)

* feat: add animation on scrolling

* refactor: improve animation

* refactor: pass trade params as children

* feat: add barrier trade param (#141)

* DTRA-1425 / Kate / Feat: add trade params for Accumulators contract (#142)

* feat: create take profit and growth rate trade params

* feat: add accumulators information trade param

* DTRA-1436 / Kate / Feat: add trade params for multipliers (#143)

* feat: add trade params for multipliers

* chore: change order to alhabetical one

* Maryia/DTRA-1427/feat: TradeTypeTabs and Strike display components (#144)

* feat: trade-type-tabs

* feat: Strike

* feat: PayoutPerPoint + refactoring (#146)

* fix: trade params config for Even/Odd

* DTRA-1424 / Kate / Enable purchase functionality (#145)

* refactor: customize amount of buttons and it name

* feat: add basis text and amount for button based on contract type

* refactor: purchase button

* feat: eanble purchase functionality

* feat: add sell functionality for acc button

* chore: add caption text from quill

* fix: add store init to bottomnav

* DTRA-1455 / Kate / Create state management for purchase button (#148)

* feat: create state management for purchase button

* chore: refactor comments

* Maryia/DTRA-1441/feat: add chart + display current spot for digit trade types (#149)

* feat: CurrentSpot init version

* fix: trade types & chart styles

* fix: trade page performance

* fix: use small localize for TextField labels to avoid app crash due to duplicate [object Object] ids

* chore: add skeleton while current spot is still updating

* fix: payout per point skeleton + refactor trade params list

* build: use version 1.13.16

* build: downgrade to quill-ui v1.13.13

* Maryia/DTRA-1441/feat: add last digit selector and expand displayed spot feature for digits (#150)

* feat: Last digit selector using bottomWidgets data from chart

* chore: digits params layout + refactoring

* feat: current spot display for ongoing contracts

* refactor: onScroll

* refactor: current-spot

* chore: wrap onScroll with useCallback

* DTRA-1487 / Kate / Add tests for new files (#151)

* feat: add tests for purchase buttom content file

* refactor: add tests for purchase button file

* refactor: change content for multipliers description

* refactor: add tests for trade type tabs file

* refactor: add tests for trade parameters container file

* refactor: add tests for trade parameters file

* chore: add more test cases

* chore: add mockcontractinfo function usage

* build: use master version of quill-ui

* DTRA-1469 / Kate / Implement Allow equals trade param and Carousel functionality (#153)

* feat: add allow equals main content and functionality

* feat: add carousel

* refactor: extracted carpusel into a separate component

* refactor: replace localize function with the component

* refactor: add variables for css

* refactor: add tests for carousel

* refactor: add test for allow equals

* chore: make id numbers

* DTRA / Kate / Refactoring: resetting style (#154)

* refactor: trading and contract details

* fix: reset button style in definition

* DTRA-1489 / Kate / Add tests (#155)

* refactor: add tests for trade

* refactor: add tests for trade param utils

* Maryia/DTRA-1491/feat: finalize LastDigitPrediction param + Current spot price animation (#152)

* feat: LastDigitPrediction stats mode

* chore: highlight min & max stats

* feat: Action sheet for LastDigitPrediction + border highlight for current spot

* fix: profit for cards in Closed tab

* feat: current spot animation for contract purchase + multiple contract purchase

* chore: improve animation + refactoring

* feat: finalize current spot animation

* refactor: address comments

* refactor: update quill ui and refactor carousel component (#156)

* DTRA-1354 / Kate / Refactor before submitting (#158)

* refactor: rename carousel prop

* refactor: add skeleton loader for video fargmenst

* DTRA-1354/ Kate / Tests for isDigitContractWinning function  (#160)

* refactor: add tests for util function

* fix: test case

* Maryia/DTRA-1491/test: last digit selector & current spot (#157)

* test: packages/trader/src/AppV2/Components/CurrentSpot/current-spot.tsx

* test: CurrentSpotDisplay

* refactor: tests

* refactor: address review comments

* test: LastDigitPrediction

* refactor: remove unused import

* test: LastDigitSelector

* test: Digit

* test: setDigitStats & setDigitTick in trade-store

* refactor: current-spot

* fix: cannot find name_plural of undefined

* chore: apply suggestions

* chore: address review comments

* fix: bottom layout

* refactor: add button type function

* chore: improve animation + apply suggestion for prev_contract

* feat: integrate v2 assets component

* test: fix tests that failed after assets v2 integration

* fix: console error

* fix: console error for trade params label

* refactor: update quill ui lib

* refactor: add dvh (#161)

* fix: video loading style

* feat: make active_symbols API call based on the selected contract_type + quill-ui components fixes

* refactor: active_symbols_v2 to has_symbols_for_v2

---------

Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com>
Co-authored-by: kate-deriv <kate@regentmarkets.com>

* chore: update @deriv/deriv-charts to 2.2.0 (#16204)

Co-authored-by: balakrishna-deriv <balakrishna-deriv@users.noreply.github.com>

* [DTRA] Maryia/OPT-862/feat: update Step Indices config and icons (#15889)

* feat: add step 200, 500, update step with step 100

* chore: update shortcode pattern for STPRNG indices

* fix: shortcode pattern and shortcode.spec.ts

* chore: update pattern for getMarketInformation

* chore: update growthbook value in AppContent

* chore: remove is_phone_number_verification_enabled

* chore: solve redirect not working issue

---------

Co-authored-by: utkarsha-deriv <utkarsha@regentmarkets.com>
Co-authored-by: amina-deriv <amina@regentmarkets.com>
Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>
Co-authored-by: rupato-deriv <97010868+rupato-deriv@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DerivFE <fe-access@regentmarkets.com>
Co-authored-by: Aswathy-Deriv <96725617+aswathy-deriv@users.noreply.github.com>
Co-authored-by: henry-deriv <118344354+henry-deriv@users.noreply.github.com>
Co-authored-by: wojciech-deriv <141034155+wojciech-deriv@users.noreply.github.com>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
Co-authored-by: balakrishna-deriv <balakrishna-deriv@users.noreply.github.com>
Co-authored-by: fasihali-deriv <121229483+fasihali-deriv@users.noreply.github.com>
Co-authored-by: Aizad Ridzo <103104395+aizad-deriv@users.noreply.github.com>
Co-authored-by: Maryia <103177211+maryia-deriv@users.noreply.github.com>
Co-authored-by: kate-deriv <121025168+kate-deriv@users.noreply.github.com>
Co-authored-by: kate-deriv <kate@regentmarkets.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants