Utkarsha/resolve conflicts upm 414 #46
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* chore: implemented lazy load on financial assessment and trading assesment * chore: working on personal details * chore: removed lazy load from personal details --------- Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>
…allets events (binary-com#16004) * feat(wallets): ✨ add wallet migration analytic * chore: 🔇 suppress ts error * chore: align with master * fix: prettified code * chore: fix isOpen condition appear twice
… client to select max value to transfer for crypto (binary-com#16024) * chore: implement Max Button inside of TransferAmountInput * chore: populate TransferInputForm when clicking Max Button * chore: update onMaxBtnHandler function * chore: fix re-rendering issue * chore: update for standard crypto
binary-com#15877) * feat: add description and disable chart Interval duration setting when not visible for 1T interval * test: ChartSettings
…introduce a new video format (binary-com#16081) * feat: add lottie package * feat: import new package for lottie and add video for acc * feat: add lottie video for majority of the contracts * refactor: deleted unused mp4 and update package json * fix: tests
* test: init ProfitTableStore * test: add more tests to profit-store * test: more tests for profit-store * refactor: use onMount when needed only * test: onMount * test: add more tests to profit-store * test: finalize tests for profit-store * refactor: introduce vars for repeated values * style: rename variable
* chore: removed popup * chore: removed from additional kyc info form * chore: removed unused code * chore: removed some props and states as well
…com#16061) * fix: reset_password_modal_in_logged_in_state * fix: check modal manager * fix: check modal manager * fix: import * feat: ts migration and test case * chore: update api-types * chore: update api-types * chore: update api-types * fix: import * fix: import * fix: test * fix: variable_name * fix: types
…et page (binary-com#16015) * chore: remove svg badge from Options section and refactor component * chore: update WalletListCardBadge in other components * chore: remove svg badge from success modal
…eriv-com/ui (binary-com#15931) * chore: update dropdown component with @deriv-com/ui * fix: clean up code * fix: failing component test * fix: applied comments * fix: updated walletlistcarddropdown structure * fix: applied comments * fix: failing checks * fix: resolve conflicts * fix: rerun vercel * fix: update dropdown component * fix: resolve error * fix: resolved subtasks * fix: add data-testid * fix: data-testid
… to allow users to go to demo or proceed with real account creation (binary-com#15758) * feat: add account icon * feat: create modal and add styles * feat: rename modal * feat: add final logic and add analytics for open and cta * feat: add tests for after-signup-flow component * feat: create tests for modal * feat: complete tests for modal * feat: add tests for modal-content * feat: modify tests, add check for passkey modal, modify modal for tablet view * refactor: optimize unit tests * feat: rename analytic action
…15747) * fix: moved all deriv packages to external * fix: removed unused packages * fix: splitchunks * fix: update minsize * fix: update minsize * fix: remove constants * Revert "fix: remove constants" This reverts commit 6151789. * Revert "fix: update minsize" This reverts commit 7f15432. * Revert "fix: update minsize" This reverts commit 3129e58. * Revert "fix: splitchunks" This reverts commit 03196b1. * Reapply "fix: remove constants" This reverts commit 6d421de. * fix: added sideEffects * fix: added formik to external * fix: added react transition group to external * fix: added classnames to external * chore: adding some missing externals * fix: removed CFDFinancialStpRealAccountSignup from entry points * chore: small changes * fix: removed tradeModal from entry points * chore: resolving the conflicts * chore: adding some lazy loading * chore: tree shaking * fix: added assets splitchunk * fix: added vendors splitchunk * fix: added chunks to splitchunk * fix: added minsize to splitchunk * fix: added utility splitchunk * fix: added enforce to assets * fix: created a separate cfd-store for internal use * fix: merged smaller chunks into one * fix: removed innergraph and sideEffects from webpack as they are default true * fix: removed sideEffects from package.json * fix: removed @deriv/api --------- Co-authored-by: hirad-deriv <hirad@regentmarkets.com>
…m#16130) * chore: add staging-hub as allowed domains for storage sync * chore: add hub.deriv.com
Co-authored-by: DerivFE <fe-access@regentmarkets.com>
binary-com#16111) * chore: 🔖 Update @deriv-com/analytics package to v1.9.0 in deriv-app * chore(wallets): 🔥 remove ignore ts comment * chore: 🎨 align package-lock * fix: 🎨 fix deriv-com/ui versioning
…#15974) * chore: [UPM-1233]/evgeniy/add "passkey_available" flag to cookie * refactor: set cookie after creating passkey * chore: remain setting cookie in store * refactor: domain for dev env * refactor: moved the logic to reusable method in client * chore: restore passkey-config changes * chore: add setPasskeysStatusToCookie to mobx action
* fix: updated blockly to 10.4.3 * fix: flyout for blockly v10 * fix: for importing strategies removed unused packages and css * fix: reverted space change * fix: reverted space change * fix: styling changes * fix: sonar cloud issues collapse issues refactored code * fix: sonar cloud * fix: refactored code * fix: reverted stores type changes * fix: reverted stores type changes * fix: multiplier blocks * fix: save strategy * fix: rerendering if block * fix: last digit * fix: trashcan position * fix: removed checkbox * fix: blockly part 1 bug fixes * fix: resolved merge conflict * fix: bug fixes from part 1 * fix: bug fixes from part 1 * fix: removed language module to reduce bot bundle size * fix: added translations to context menu * fix: blockly bugs * fix: async clear function * fix: failing test case * fix: RTL issues and test cases * fix: for context menus * fix: for accumlators block * fix: for accumlators * fix: dropdown values * fix: updated selectors for blockly * fix: removed package-lock-json * fix: renamed context menu method in blocklyjs * fix: review comments * fix: review comments * fix: review comments * fix: missing selector for modal * fix: updated package json
* fix: password * chore: Empty-Commit
Co-authored-by: DerivFE <fe-access@regentmarkets.com>
…binary-com#16010) * fix: bug with translation of value instead of text * fix: remove variables from passing to localize * refactor: apply suggestions * fix: tests
…enu (binary-com#16156) * fix: added missing translations for blockly context menu * fix: added translations missing blocks
Co-authored-by: DerivFE <fe-access@regentmarkets.com>
…m#16147) * feat: added the residence in the analytics * feat: updated the analytics version * feat: updated the analytics version
* 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
* feat: squashed deriv-api removal * feat: test fix * feat: minor typing update
…erver (binary-com#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
Co-authored-by: balakrishna-deriv <balakrishna-deriv@users.noreply.github.com>
* 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>
* fix: fix failing tests * chore: add mockbalance
Co-authored-by: DerivFE <fe-access@regentmarkets.com>
amina-deriv
merged commit 15c3ea3
into
yauheni-deriv:evgeniy_upm-414_remove-passkey-flow
1 check failed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: