This repository was archived by the owner on May 20, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 183
Konstantinos / Fix Conflicts 2 #4362
Merged
habib-deriv
merged 71 commits into
binary-com:translation-rebranding-deriv
from
konstantinosG-deriv:translation-85510-conflicts2
Mar 20, 2023
Merged
Konstantinos / Fix Conflicts 2 #4362
habib-deriv
merged 71 commits into
binary-com:translation-rebranding-deriv
from
konstantinosG-deriv:translation-85510-conflicts2
Mar 20, 2023
Conversation
This file contains hidden or 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
…on is misleading, this needs to be revised (binary-com#4188) * fix: fix not available * Apply suggestions from code review Updated content from Not Applicable to Not applicable --------- Co-authored-by: Konstantinos-Gk <[email protected]> Co-authored-by: Habib Deriv <[email protected]>
* refactor: adding hard lazy loading in cfd page * refactor: adding hard lazy loading in cfd page * refactor: adding hard lazy loading in cfd page * refactor: adding hard lazy loading in cfd page * refactor: plp margin calculator bug fix * refactor: plp margin calculator bug fix
* refactor: adding hard lazy loading in cfd page * refactor: adding hard lazy loading in cfd page * refactor: adding hard lazy loading in cfd page * refactor: adding hard lazy loading in cfd page * refactor: plp margin calculator bug fix * refactor: plp margin calculator bug fix * refactor: hard lazy load in dmt5 page * refactor: hard lazy loader in dmt5 page * refactor: to fix console warning for pnl margin
binary-com#4067) * feat: update derived_dx data * fix: path of image * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * feat: update description text of derived-fx * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch --------- Co-authored-by: DerivFE <[email protected]>
…#4173)" (binary-com#4199) This reverts commit 6ffe151.
…n Locations pages. (binary-com#4203) * fix: locations changes * fix: job location name --------- Co-authored-by: Konstantinos-Gk <[email protected]>
Co-authored-by: meenakshi-deriv <[email protected]>
* chore: fix ip cookie issue * chore: fix ip cookie issue * chore: made country readonly
* fix: 🐛 update uk office location * fix: 🐛 change the map link * fix: 🐛 add comma and change quality of image
* chore: translation strings * chore: update code
…inary-com#4210) * fix: remove duplicate message * fix: remove message for cpa too --------- Co-authored-by: Konstantinos-Gk <[email protected]>
Co-authored-by: Muhammad Fasih <[email protected]>
… volatility indices (binary-com#4148) * feat: update affiliate ib information * auto-pull-translation
…ter of the word Derived FX are cut in responsive (binary-com#4224) * fix: make TabList on market page responsive * fix: make TabList on market page responsive
* fix: speed up country checks * fix: add null check * fix: more null checks * fix: cleanup * fix: use previous logic * fix: add suggestions from code review * refactor: move some declarations into useeffect * feat: added fallback * fix: update website_status state
…f as main format (binary-com#4216) * feat: compress specific images * feat: modified some images * fix: image positioning * chore: modified settings * fix: removed placeholder * feat: adjusted quality based on qa * chore: further bumped quality * chore: more compression * fix: revert animation reduction * fix: error in ios * fix: remove border * fix: container height * fix: image positioning * fix: remove placeholder
* fix: re-added eu redirection with updated logic * chore: change import oder
* chore: fix staging redirect * chore: add fix
…y-com#4253)" (binary-com#4264) This reverts commit 04d1faa.
…com#4293) * feat: optimised tabs with fixing back button * fix: removed optimisations and removed new button * fix: added check because build is getting failed * docs: added discription in tab state hook --------- Co-authored-by: Muhammad Fasih <[email protected]>
* fix: changing website content from url param * fix: condition for browser
* fix: sentence * fix: sentence2 * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch --------- Co-authored-by: Konstantinos-Gk <[email protected]> Co-authored-by: DerivFE <[email protected]>
…mpliance Officer to Chief Risk & Compliance Officer in Deriv (About Us) page (binary-com#4291) * fix: joanna role change * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch --------- Co-authored-by: Konstantinos-Gk <[email protected]> Co-authored-by: DerivFE <[email protected]>
…deriv-com into translation-rebranding-deriv
* text: 💬 fix translation issue on staging * translations: update translation files * text: 💬 fetch master translation
…deriv-com into translation-85510-conflicts2
…tion-85510-conflicts2
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
Running Lighthouse audit... |
Kudos, SonarCloud Quality Gate passed!
|
habib-deriv
added a commit
that referenced
this pull request
Mar 20, 2023
This reverts commit 4a04c42.
habib-deriv
added a commit
that referenced
this pull request
Mar 20, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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:
Type of change