diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index aa147551868..63bca49b83a 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -22,7 +22,7 @@ env: GATSBY_RUDDERSTACK_STAGING_KEY: ${{ secrets.GATSBY_RUDDERSTACK_STAGING_KEY }} GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }} GATSBY_RUDDERSTACK_URL: ${{ secrets.GATSBY_RUDDERSTACK_URL }} - + jobs: release-beta: timeout-minutes: 30 @@ -53,7 +53,7 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - command: pages publish public --project-name=deriv-com-pages --branch=beta + command: pages deploy public --project-name=deriv-com-pages --branch=beta - name: Cloudflare preview link ✨ run: echo "New beta website - https://beta.deriv.com" diff --git a/.github/workflows/generate-preview-link.yml b/.github/workflows/generate-preview-link.yml new file mode 100644 index 00000000000..51138a374f1 --- /dev/null +++ b/.github/workflows/generate-preview-link.yml @@ -0,0 +1,197 @@ +name: Generate preview link + +permissions: + actions: write + checks: write + contents: write + deployments: write + pull-requests: write + statuses: write + +on: + workflow_run: + workflows: ['Pre-generate preview link'] + types: + - completed + +env: + NODE_OPTIONS: '--max-old-space-size=8192' + +concurrency: + group: cloudflare-pages-build-${{ github.event.workflow_run.head_branch }} + cancel-in-progress: true + +jobs: + build_to_cloudflare_pages: + runs-on: Ubuntu-latest + if: > + github.event.workflow_run.event == 'pull_request' && + github.event.workflow_run.conclusion == 'success' + steps: + - name: Download artifact + id: download-artifact + uses: dawidd6/action-download-artifact@v2 + with: + workflow_conclusion: success + run_id: ${{ github.event.workflow_run.id }} + name: 'pr-${{ github.event.workflow_run.id }}' + + - name: Retrieve pull request + id: pr_information + run: | + echo "issue_number=$(cat ./NR)" > $GITHUB_OUTPUT + + - name: 'Generate action link comment' + id: generate_action_url + uses: actions/github-script@v3 + with: + github-token: ${{ github.token }} + script: | + const action_url = "${{github.server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}" + const comment = [ + '| Name | Result |', + '| :--- | :------ |', + `| **Build status** | Building 🔨 |`, + `| **Action URL** | [Visit Action](${action_url}) |`, + '' + ].join('\n') + core.setOutput("comment", comment); + - name: Post Cloudflare Pages Preview comment + uses: marocchino/sticky-pull-request-comment@v2 + with: + header: Cloudflare Pages Preview Comment + number: ${{steps.pr_information.outputs.issue_number}} + message: ${{steps.generate_action_url.outputs.comment}} + recreate: true + + - name: Verify user organization + id: verify_user_organization + run: | + echo "Verifying user's organization..." + user=$(cat ./USERNAME) + response=$(curl -s -L \ + -w "%{http_code}" \ + -o /dev/null -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${{ secrets.PERSONAL_ACCESS_TOKEN }}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "https://api.github.com/orgs/binary-com/memberships/$user") + + if [ $response != "200" ]; then + echo "User is not a member of binary-com organization." + exit 1 + else + echo "User is a member of binary-com organization." + echo "Proceeding to build and deploy for the pull request: https://github.com/binary-com/deriv-com/pull/$(cat ./NR)" + fi + - name: Checkout to repo + uses: actions/checkout@v3 + with: + ref: ${{ github.event.workflow_run.head_sha }} + + - name: Setup node + uses: actions/setup-node@v2 + + - name: Get build output from master cache + uses: actions/cache/restore@v3 + with: + key: master-cache-public + restore-keys: | + master-cache-public-replica + path: | + .cache + public + - name: Get cached dependencies + id: cache-npm + uses: actions/cache/restore@v3 + with: + path: node_modules + key: npm-${{ hashFiles('**/package-lock.json') }} + + - name: Install dependencies + if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }} + run: npm ci + + - name: Build project + id: build-project + run: npm run build + + - name: Publish to Cloudflare Pages + id: publish-to-pages + env: + CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_TEST_LINKS_API_TOKEN }} + CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_TEST_LINKS_ACCOUNT_ID }} + run: | + echo "Installing Wrangler CLI" + npm i -g wrangler + echo "Deploying build to Cloudflare Pages" + directory='public' + projectName='deriv-com-preview-links' + head_branch=${{github.event.workflow_run.head_branch}} + branch=$(echo $head_branch | head -c 20) + preview_url=$(wrangler pages deploy $directory --project-name=$projectName --branch=$branch > log.txt 2>&1; echo $?) + echo "------" + cat log.txt + branchName=$(echo $branch | sed 's/[\/_\.]/-/g') + if grep -q "Deployment complete" log.txt; then + echo "preview_url=https://$branchName.deriv-com-preview-links.pages.dev" > "$GITHUB_OUTPUT" + else + echo "Deployment to Cloudflare Pages failed." + exit 1 + fi + - name: 'Generate preview link comment' + if: success() + id: generate_preview_url + uses: actions/github-script@v3 + with: + github-token: ${{ github.token }} + script: | + const action_url = "${{github.server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}" + const preview_url = "${{steps.publish-to-pages.outputs.preview_url}}" + const comment = [ + `**Preview Link**: ${preview_url}`, + '| Name | Result |', + '| :--- | :------ |', + `| **Build status** | Completed ✅ |`, + `| **Preview URL** | [Visit Preview](${preview_url}) |`, + `| **Action URL** | [Visit Action](${action_url}) |`, + '' + ].join('\n') + core.setOutput("comment", comment); + - name: 'Generate failure comment' + if: failure() + id: generate_failure_comment + uses: actions/github-script@v3 + with: + github-token: ${{ github.token }} + script: | + const action_url = "${{github.server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}" + const comment = [ + '| Name | Result |', + '| :--- | :------ |', + `| **Build status** | Failed ❌ |`, + `| **Action URL** | [Visit Action](${action_url}) |`, + '' + ].join('\n') + core.setOutput("comment", comment); + - name: Post Cloudflare Pages Preview comment + if: success() || failure() + uses: marocchino/sticky-pull-request-comment@v2 + with: + header: Cloudflare Pages Preview Comment + number: ${{steps.pr_information.outputs.issue_number}} + message: ${{steps.generate_preview_url.outputs.comment || steps.generate_failure_comment.outputs.comment }} + recreate: true + + - name: E2E Smoke Test + run: | + curl -X POST \ + -H "Authorization: token ${{ secrets.e2e-deriv-com }}" \ + -H "Accept: application/vnd.github.everest-preview+json" \ + "https://api.github.com/repos/deriv-com/e2e-deriv-com/dispatches" \ + -d '{ + "event_type": "run-e2e-tests", + "client_payload": { + "baseurl": "${{steps.publish-to-pages.outputs.preview_url}}" + } + }' + diff --git a/.github/workflows/pre-generate-preview-link.yml b/.github/workflows/pre-generate-preview-link.yml new file mode 100644 index 00000000000..39dcb6a8197 --- /dev/null +++ b/.github/workflows/pre-generate-preview-link.yml @@ -0,0 +1,28 @@ +name: Pre-generate preview link + +permissions: + pull-requests: write + +on: + pull_request: + types: [opened, synchronize] + +concurrency: + group: cloudflare-pages-verify-${{ github.head_ref }} + cancel-in-progress: true + +jobs: + verify_pull_request: + runs-on: Ubuntu-latest + steps: + - name: Retrieve PR information + run: | + mkdir -p ./pr + echo ${{ github.event.number }} > ./pr/NR + echo ${{ github.event.pull_request.user.login }} > ./pr/USERNAME + + - name: Upload PR information to artifact + uses: actions/upload-artifact@v2 + with: + name: 'pr-${{github.run_id}}' + path: pr/ diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 824977bf921..39e8be40831 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -58,7 +58,7 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - command: pages publish public --project-name=deriv-com-pages --branch=main + command: pages deploy public --project-name=deriv-com-pages --branch=main - name: Cloudflare production link ✨ run: echo "New website - http://cf-pages-deriv-com.deriv.com" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index b6d91167eb1..be046fe6143 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -55,7 +55,7 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - command: pages publish public --project-name=deriv-com-pages --branch=staging + command: pages deploy public --project-name=deriv-com-pages --branch=staging - name: Cloudflare preview link ✨ run: echo "New staging website - http://staging.cf-pages-deriv-com.deriv.com" diff --git a/crowdin/messages.json b/crowdin/messages.json index 25098e02bfa..6c360f3015a 100644 --- a/crowdin/messages.json +++ b/crowdin/messages.json @@ -5,6 +5,7 @@ "4007432": "Singapore", "4506932": "How do I add a Deriv X account?", "5681962": "EUR/USD DFX10 Index", + "6312314": "Deriv (V) Ltd (Company No. 014556), incorporated on the 17th February 2016, is registered in the Republic of Vanuatu with its registered office located at 1276, Govant Building, Kumul Highway, Port Vila, Republic of Vanuatu. Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission <0>(view licence) and is a member of the <1>Financial Markets Association.", "7128051": "How can I adjust or remove my self-exclusion limits?", "7228511": "Determine your commission per transaction, subject to our established thresholds.", "7359443": "Focused accounts for a focused strategy", @@ -16,7 +17,6 @@ "17217397": "Cryptocurrency", "19552684": "USD Basket", "20135418": "100,000", - "21294053": "Since 1999, the group has served traders around the world with integrity and reliability. We always hold ourselves to the highest ethical standards and regulatory requirements.", "22146527": "Secure, responsive platform", "22354933": "Your money is held in secure financial institutions and is always available to you, should you wish to withdraw. We don't use your money for our business purposes.", "22360354": "Enjoy trading a wide range of offerings that mimic characteristics of financial markets or are derived from them.", @@ -79,7 +79,6 @@ "69859952": "Please enter your company name.", "70604999": "As jump indices are synthetics, you can trade them 24/7, 365 days of the year.", "70668746": "If you select 'Rise', you receive the payout if the exit price is higher than the entry price.", - "70678818": "Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<0>licence). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<1>licence). Deriv (V) Ltd is licensed and regulated by the Vanuatu Financial Services Commission (<2>licence). Deriv (SVG) LLC has a registered office at Hinds Buildings, Kingstown, St. Vincent and the Grenadines. Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.", "71016232": "OMG/USD", "71057750": "Go to {{platform_name}} dashboard", "71263224": "How can I cancel my withdrawal?", @@ -136,7 +135,7 @@ "121961018": "If you're residing in the EU or UK, <0>contact us via live chat, and we'll help you with it.", "123005346": "No artificial barriers to customer withdrawals", "123291381": "What is the rebranding about?", - "131637194": "For <0>metals, there is a fixed commission of USD 4 per lot. A deal for 1 lot of XAU/USD will pay out USD 4 in commission based on the following formula:", + "128120244": "Since 1999, the Group has served traders around the world with integrity and reliability. We always hold ourselves to the highest ethical standards and regulatory requirements.", "132319176": " take profit level", "135121884": "What’s next?", "135210620": "Deriv is <0>regulated by several entities including the Malta Financial Services Authority (MFSA), the Labuan Financial Services Authority (Labuan FSA), the Vanuatu Financial Services Commission (VFSC), and the British Virgin Islands Financial Services Commission.", @@ -214,6 +213,7 @@ "221408375": "Deriv partnership programme is free to join. There are absolutely no charges or hidden fees to worry about.", "222070679": "We’ll deposit your commissions directly into your account as soon as practicable after the 15th of every month.", "222685906": "( 1", + "223464180": "Clients in the rest of the world (except for certain countries such as the USA, Canada, and Hong Kong) who wish to trade CFDs on financial instruments (via MT5 Financial accounts) and derived indices (via MT5 Derived accounts) can have Deriv MT5 and Deriv X accounts under Deriv (V) Ltd.", "223659990": "Commission per lot (1 standard lot is 100k units)", "224644767": "Business Partnership", "224650827": "IOT/USD", @@ -279,6 +279,7 @@ "274438767": "The order amount is locked in escrow until both parties confirm that the transaction has been completed from their end.", "275116637": "Deriv X", "275316510": "Impersonators ask you to send confidential information over an unsecure platform, for example via SMS, WhatsApp, email, etc.", + "276089446": "All spreads are indicative. To view real-time spreads, please refer to your terminal.", "276341434": "As part of our rebranding exercise, your affiliate login URL will change.", "276482397": "No, you can't.", "278499050": "Use your local currency to make deposits into and withdrawals from your Deriv account.", @@ -326,7 +327,6 @@ "323360883": "Baskets", "325128398": "3. Duration", "326242312": "Volume in lots", - "326551423": "Clients in the rest of the world (except for restricted countries such as the USA, Canada, and Hong Kong) who wish to trade CFDs on financial instruments (via MT5 Financial accounts) and derived indices (via MT5 Derived accounts) can have Deriv MT5 and Deriv X accounts under Deriv (V) Ltd.", "327728169": "12.5", "328362983": "0.4%", "331304444": "- Setting the duration of your trade.", @@ -396,6 +396,7 @@ "400968378": "locations", "401280184": "Hit <0>Get under <1>CFDs and <2>Deriv EZ.", "401450104": "> 3 - 5 billion", + "401498558": "Deriv (FX) Ltd (Company No. LL13394), incorporated on the 18th January 2017, is registered in the Federal Territory of Labuan (Malaysia) with its registered office located at Unit No. 3A-16, Level 3A, Labuan Times Square, Jalan Merdeka, 87000, Federal Territory of Labuan, Malaysia. Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority <0>(view licence) and is a member of the <1>Labuan Fintech Association.", "403435120": "Trade the way you want with 2 flexible trade types.", "404778224": "An intuitive,", "406075956": "If you select ‘Odd’, you will win the payout if the last digit of the last tick is an odd number (i.e. 1, 3, 5, 7, or 9).", @@ -677,6 +678,7 @@ "655902997": "You may reactivate your account by <1>logging in with your email address and password. If you're unable to do so, please <0>contact us via live chat, and we'll help you further.", "656430237": "How do I rate or recommend my trade partners on Deriv P2P?", "657066292": "You can connect to your trusted bridge partner via a FIX API protocol connection.", + "657439941": "Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<0>licence). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<1>licence). Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<2>licence). Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.", "658337631": "Got a <0>Binary.com account? You can <1>log in to <0>Deriv with your <0>Binary.com username and password", "659338852": "Stop loss or ", "661969161": "Execution speed", @@ -842,7 +844,6 @@ "821579030": "QID.US", "822013794": "<0>Contact us via live chat to get help with changing your account currency.", "822932128": "Help centre | Frequently asked questions | Deriv", - "823109266": "Clients in the rest of the world (except for restricted countries such as the USA, Canada, and Hong Kong) who wish to trade CFDs on forex and cryptocurrencies can have Deriv MT5 Financial STP accounts under Deriv (FX) Ltd.", "824381946": "This gives you the margin requirement in the quote currency for forex pairs, or in the denomination of the underlying asset for other instruments.", "825675433": "Stocks & indices trades available on Deriv", "826324021": "Deriv.com on laptop and mobile", @@ -895,6 +896,7 @@ "871462332": "Take advantage of high leverage and low spreads on Deriv MT5 and Deriv X.", "872087592": "For Rise/Fall, contract durations range from 1 tick and 365 days.", "874881951": "Browse job opportunities available at our Dubai office. Find your role in IT, marketing, and human resources.", + "876316694": "The services offered on Deriv.com are provided by Deriv Group. The Group has several subsidiary companies that are licensed to operate Deriv.com in their registered jurisdictions.", "876462120": "2. On the left side panel, under the “Security & Safety” category, choose the “Email and passwords” or you may click <0>here", "876581050": "Slovakia", "877897643": "Advantages of trading forex on DTrader", @@ -935,7 +937,6 @@ "903422317": "Get instant access to your trades wherever you are whenever you want.", "904780038": "Set the restart conditions", "907733837": "Predict whether the market price will touch or not touch the chosen barrier (target) during the contract period.", - "908042853": "Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.", "909083576": "404 - Page not found | Deriv", "912406629": "Follow these steps:", "912981300": "One more thing: We’ve rebranded our social media profiles to @Derivdotcom on Facebook, Instagram, and Twitter. Like and follow us to stay updated with our latest news.", @@ -1027,7 +1028,6 @@ "1010278278": "Can I delete my Deriv MT5 account history?", "1010645311": "Predict the price movements of commodities like silver, gold, and oil, and use margin to amplify your possible profits.", "1011699543": "Trade the price movements of natural resources that are central to the world’s economy and make the most of the market action.", - "1012902658": "Yes. <0>Contact us via live chat and we'll help you with it.", "1015371290": "Experienced affiliate managers answer all your queries and provide you with excellent promotional and educational materials.", "1015510435": "BMW", "1016846951": "> USD 20,000 per month", @@ -1118,7 +1118,6 @@ "1093308928": "

No, these are two different contract types.

With High/Low Ticks, you predict which of the 5 ticks within the trade duration will be the highest or lowest.

With Higher/Lower, you predict the overall price direction of a trading instrument over a specified time period.

", "1094162624": "<0>High-Close: When you purchase a ‘High-Close’ contract, your win or loss will be equal to the multiplier times the difference between the high and the close over the duration of the contract.", "1095420663": "Purchase the contract", - "1096453413": "Deriv Investments (Europe) Limited – W Business Centre, Level 3, Triq Dun Karm, Birkirkara BKR 9033, Malta – is licensed in Malta (<0>licence no. IS/70156) and regulated by the Malta Financial Services Authority under the Investments Services Act.", "1097133380": "0.35", "1097188292": "Take profit level", "1098544147": "They ask you to fill up a form on an unsecure website without an HTTPS (secured) connection.", @@ -1394,7 +1393,6 @@ "1371193412": "Cancel", "1372981277": "Responsive platforms", "1373549717": "Jump Indices", - "1374012502": "Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence). Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<1>licence). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<2>licence). Deriv (V) Ltd is licensed and regulated by the Vanuatu Financial Services Commission (<3>licence). Deriv (SVG) LLC has a registered office at Hinds Buildings, Kingstown, St. Vincent and the Grenadines. Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.", "1374586234": "Grow your potential payout at every tick with accumulator options. Accumulator trading is available on volatility indices under derived indices.", "1375342464": "Deriv MT5 signals", "1376119698": "Why does the \"Matches\" contract have a higher predicted payout compared to \"Differs\"?", @@ -1494,7 +1492,6 @@ "1466745668": "Predict what number will be the last digit of the last tick of a contract.", "1466788657": "For more info, <0>check out this blog post on the basics of building a trading bot.", "1467325385": "Global affiliate support", - "1467990765": "Deriv (FX) Ltd — F16, Level 1, Paragon Labuan, Jalan Tun Mustapha, Labuan 87000, Malaysia — is licensed by Labuan Financial Services Authority (<0>licence no. MB/18/0024) and is a member of the <1>Labuan Fintech Association.", "1468688914": "Make instant deposits using crypto to your fiat account.", "1469255430": "terms and conditions", "1469626982": "USD/CNH", @@ -1728,6 +1725,7 @@ "1658594963": "Can I change the tick duration for the High/Low Ticks contract type?", "1659675491": "Practise trading from the mobile app, desktop app, or through your web browser.", "1659681650": "- Asset managers", + "1659687862": "Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.", "1661123842": "- Purchase the contract", "1661263248": "How can I download my Deriv MT5 history?", "1663880277": "Will I be required to pay a fee to become a premium payment agent?", @@ -2082,6 +2080,7 @@ "1975644912": "Enjoy an intuitive, easy-to-use interface, even for new traders.", "1976889936": "Yes, you can select the duration of your Touch/No Touch contract. You can choose to open a contract for as short as 5 ticks to as long as 365 days (depending on the trading asset selected).", "1978148367": "Open a real account, make a deposit, and start trading for real. Trade forex, indices, commodities, and more.", + "1979304570": "Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence). Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<1>licence). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<2>licence). Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<3>licence). Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.", "1979503547": "Trading terms", "1980724783": "The point value is derived from the current digits of the asset. In this example, the digit is 5, so the point value is 0.00001.", "1982404952": "Get quote", @@ -2193,6 +2192,7 @@ "2075864188": "FREE", "2076930425": "Find out how Deriv P2P works", "2077489833": "Do I get commission as a payment agent?", + "2079084552": "Deriv (BVI) Limited (Company No. 1841206), incorporated on the 15th September 2014, is registered in the British Virgin Islands with its registered office located at Kingston Chambers, P.O. Box 173, Road Town, Tortola British Virgin Islands. Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission <0>(view licence).", "2080629326": "Select your XML file and hit <0>Open.", "2080773053": "Available instruments", "2083818875": "<0>SLV.US The iShares Silver Trust ETF seeks to reflect generally the performance of the price of silver.", @@ -3071,7 +3071,7 @@ "-1307341240": "extra info icon", "-1244234227": "Digital options allow you to predict the outcome from two possible results and earn a fixed payout if your prediction is correct.", "-1070571484": "Digital options available on Deriv", - "-1041443625": "Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence). Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiary with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.", + "-819894788": "Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act <0>(licence). Deriv.com Limited is the holding company for the above subsidiary with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ.", "-99908951": "Please read our <0>Terms and conditions,<1> Risk disclosure, and <2>Secure and responsible trading to fully understand the risks involved before using our services. The information on this website does not constitute investment advice.", "-1353183095": "CFDs and other products offered on this website are complex instruments with high risk of losing money rapidly owing to leverage. You should consider whether you understand how these products work and whether you can afford to risk losing your money.", "-773544978": "Home", @@ -3129,7 +3129,6 @@ "-1638607416": "Download now >", "-1981735781": "One broker, countless trading opportunities", "-1722031734": "Check trading specs", - "-61718257": "Speculate on the price movements of popular exchange-traded funds (ETFs). Diversify your portfolio with assets that track bonds, commodities, and indices, without the high cost of owning the underlying assets.", "-777850431": "View all >", "-1384760133": "Bid price", "-1882694284": "Ask price", @@ -4143,18 +4142,16 @@ "-1460908018": "Multipliers - cryptocurrencies", "-682734426": "Multipliers - synthetics: Volatility 250 (1s) Index", "-832341678": "CFDs - synthetics: Crash 300 Index", - "-1488849807": "The services offered on Deriv.com are provided by the Deriv Group. The group has several subsidiary companies that are licensed to operate Deriv.com in their registered jurisdictions.", "-1131400885": "Deriv Investments (Europe) Limited", - "-398588615": "Deriv Investments (Europe) Limited – W Business Centre, Level 3, Triq Dun Karm, Birkirkara BKR 9033, Malta – is licensed in Malta (<0>licence no. IS/70156) and regulated by the Malta Financial Services Authority under the Investments Services Act to provide investment services in the European Union.", + "-1231248751": "Deriv Investments (Europe) Limited (Company No. C 70156), incorporated on the 22nd April 2015, is registered in Malta with its registered office located at Level 3, W Business Centre, Triq Dun Karm, Birkirkara BKR9033, Malta. Deriv Investments (Europe) Ltd is licensed in Malta and regulated by the Malta Financial Services Authority under the Investments Services Act <0>(view licence) to provide investment services.", "-2051445931": "Clients in the European Union who wish to trade financial instruments can have accounts under Deriv Investments (Europe) Limited.", "-112814932": "Deriv (FX) Ltd", + "-1269257733": "Clients in the rest of the world (except for restricted countries such as the USA, Canada, and Hong Kong) who wish to trade CFDs on forex and cryptocurrencies can have MT5 Financial STP accounts under Deriv (FX) Ltd.", "-2019617323": "Deriv (BVI) Ltd", - "-689442324": "Deriv (BVI) Ltd – Kingston Chambers, P.O. Box 173, Road Town, Tortola British Virgin Islands – is licensed by the British Virgin Islands Financial Services Commission <0>licence no. SIBA/L/18/1114).", "-1352186495": "Clients in the rest of the world (except for certain countries such as the USA, Canada, and Hong Kong) who wish to trade CFDs on financial instruments (via MT5 Financial accounts) and derived indices (via MT5 Derived accounts) can have Deriv MT5 accounts under Deriv (BVI) Ltd.", - "-1019769067": "Deriv (V) Ltd (<0>view licence) – 1276, Kumul Highway, Port Vila, Vanuatu – is licensed by Vanuatu Financial Services Commission, and is a member of the <1>Financial Markets Association<1/>.", "-1089385344": "Deriv (SVG) LLC", - "-386585223": "Deriv (SVG) LLC is located in First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P. O., St. Vincent and the Grenadines (company no. 273 LLC 2020).", - "-1824040310": "Deriv Holdings (Guernsey) Limited", + "-674534026": "Deriv (SVG) LLC (Company No. 273 LLC 2020), incorporated on the 12th February 2019, is registered in Saint Vincent and the Grenadines with its registered office located at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines.", + "-200783784": "Deriv.com Limited", "-1528857737": "The Financial Commission", "-1678516609": "Deriv operates and offers its products and services under the Deriv Group, which has several subsidiary companies licensed in their respective jurisdictions.", "-1937167246": "Return to log in", diff --git a/gatsby-browser.js b/gatsby-browser.js index 5160f2f2972..e1056afcdb9 100644 --- a/gatsby-browser.js +++ b/gatsby-browser.js @@ -21,7 +21,7 @@ const is_browser = typeof window !== 'undefined' const checkDomain = () => { return eval( decodeURIComponent( - 'var%20curhost%20%3D%20window.location.hostname%3B%20var%20t8hvj%20%3D%20%2F%5Cb%28deriv%7Cbinary%7Cbinaryqa%5B0-9%5D%7B2%7D%29%5C.%28com%7Cbot%7Cme%7Cbe%7Capp%7Csx%29%24%7C%5Cb%28localhost%29%2Fgm%3B%20if%20%28t8hvj.test%28curhost%29%20%3D%3D%20false%29%7Balert%28%22Not%20our%20domain%22%29%7D', + 'var%20curhost%20%3D%20window.location.hostname%3B%20var%20t8hvj%20%3D%20%2F%5Cb%28deriv%7Cbinary%7Cbinaryqa%5B0-9%5D%7B2%7D%29%5C.%28com%7Cbot%7Cme%7Cbe%7Capp%7Csx%29%24%7C%5Cb%28localhost%29%7C%28%5Cbderiv-com-preview-links.pages.dev%29%2Fgm%3B%20if%20%28t8hvj.test%28curhost%29%20%3D%3D%20false%29%7Balert%28%22Not%20our%20domain%22%29%7D', ), ) } diff --git a/src/common/constants.ts b/src/common/constants.ts index aa031936647..49c3e63ca13 100644 --- a/src/common/constants.ts +++ b/src/common/constants.ts @@ -184,5 +184,5 @@ export const bannerTypes = { } export const firebaseConfig = { - databaseURL: 'https://deriv-static-pricingfeedv2.firebaseio.com', + databaseURL: 'https://deriv-static-pricingfeed.firebaseio.com', } diff --git a/src/common/utility.ts b/src/common/utility.ts index 96fa25a4de6..a5d4b4f2646 100644 --- a/src/common/utility.ts +++ b/src/common/utility.ts @@ -394,7 +394,12 @@ export const isEuDomain = () => export const isLocalhost = () => !!(isBrowser() && process.env.NODE_ENV === 'development') -export const isTestlink = () => !!(isBrowser() && window.location.hostname.includes('binary.sx')) +export const isTestlink = () => + !!( + isBrowser() && + (window.location.hostname.includes('binary.sx') || + window.location.hostname.includes('deriv-com-preview-links.pages.dev')) + ) export const matchHashInURL = (hash: string) => isBrowser() && location.hash.replace('#', '') === hash diff --git a/src/components/elements/symbols-shortcode.ts b/src/components/elements/symbols-shortcode.ts index 6458888eabd..7547e1df030 100644 --- a/src/components/elements/symbols-shortcode.ts +++ b/src/components/elements/symbols-shortcode.ts @@ -1,53 +1,51 @@ -// etfs -import ETFSICON from 'images/svg/symbols/etf-usd-500.svg' //commodities import Vol_1HZ250V from 'images/svg/symbols/volatility_250_1s.svg' import Vol_1HZ150V from 'images/svg/symbols/volatility_150_1s.svg' import WTI_OIL from 'images/svg/symbols/usd-brent.svg' import CL_BRENT from 'images/svg/symbols/pound-brent.svg' import XAGEUR from 'images/svg/symbols/silver-eur.svg' -import XAGUSD from 'images/svg/symbols/silver-usd.svg' +import frxXAGUSD from 'images/svg/symbols/silver-usd.svg' import XAUEUR from 'images/svg/symbols/gold-eur.svg' import XALUSD from 'images/svg/symbols/aluminium-usd.svg' -import XCUUSD from 'images/svg/symbols/copper-usd.svg' -import XAUUSD from 'images/svg/symbols/gold-usd.svg' +import frxXCUUSD from 'images/svg/symbols/copper-usd.svg' +import frxXAUUSD from 'images/svg/symbols/gold-usd.svg' import XNIUSD from 'images/svg/symbols/nickel-usd.svg' import XPBUSD from 'images/svg/symbols/lead-usd.svg' -import XPDUSD from 'images/svg/symbols/palladium-usd.svg' -import XPTUSD from 'images/svg/symbols/platinum-usd.svg' +import frxXPDUSD from 'images/svg/symbols/palladium-usd.svg' +import frxXPTUSD from 'images/svg/symbols/platinum-usd.svg' import XZNUSD from 'images/svg/symbols/zinc-usd.svg' //crypto -import ADAUSD from 'images/svg/symbols/ada-usd.svg' -import ALGUSD from 'images/svg/symbols/algorand.svg' -import AVAUSD from 'images/svg/symbols/avalanche.svg' -import BATUSD from 'images/svg/symbols/bat.svg' -import BCHUSD from 'images/svg/symbols/btc_cash_flag-new.svg' -import BNBUSD from 'images/svg/symbols/bnb-usd.svg' -import BTCETH from 'images/svg/symbols/btc-eth.svg' -import BTCLTC from 'images/svg/symbols/bct-ltc.svg' -import BTCUSD from 'images/svg/symbols/btc-usd.svg' -import DOGUSD from 'images/svg/symbols/dog-usd.svg' -import DOTUSD from 'images/svg/symbols/dot-usd.svg' -import DSHUSD from 'images/svg/symbols/dsh-usd1.svg' -import EOSUSD from 'images/svg/symbols/eos-usd1.svg' -import ETCUSD from 'images/svg/symbols/etc-usd.svg' -import ETHUSD from 'images/svg/symbols/eth-usd.svg' -import FILUSD from 'images/svg/symbols/fil-usd.svg' -import IOTUSD from 'images/svg/symbols/iot-usd.svg' -import LNKUSD from 'images/svg/symbols/lnk-usd.svg' -import LTCUSD from 'images/svg/symbols/ltc-usd.svg' -import MKRUSD from 'images/svg/symbols/mkr-usd.svg' -import MTCUSD from 'images/svg/symbols/mtc-usd.svg' -import NEOUSD from 'images/svg/symbols/neo-usd.svg' -import OMGUSD from 'images/svg/symbols/omg-usd.svg' -import SOLUSD from 'images/svg/symbols/sol-usd.svg' -import TRXUSD from 'images/svg/symbols/trx-usd.svg' -import UNIUSD from 'images/svg/symbols/uni-usd.svg' -import XLMUSD from 'images/svg/symbols/xlm-usd.svg' -import XMRUSD from 'images/svg/symbols/xmr-usd.svg' -import XRPUSD from 'images/svg/symbols/xrp-usd1.svg' -import XTZUSD from 'images/svg/symbols/xtz-usd.svg' -import ZECUSD from 'images/svg/symbols/zec-usd.svg' +import cryADAUSD from 'images/svg/symbols/ada-usd.svg' +import cryALGUSD from 'images/svg/symbols/algorand.svg' +import cryAVAUSD from 'images/svg/symbols/avalanche.svg' +import cryBATUSD from 'images/svg/symbols/bat.svg' +import cryBCHUSD from 'images/svg/symbols/btc_cash_flag-new.svg' +import cryBNBUSD from 'images/svg/symbols/bnb-usd.svg' +import cryBTCETH from 'images/svg/symbols/btc-eth.svg' +import cryBTCLTC from 'images/svg/symbols/bct-ltc.svg' +import cryBTCUSD from 'images/svg/symbols/btc-usd.svg' +import cryDOGUSD from 'images/svg/symbols/dog-usd.svg' +import cryDOTUSD from 'images/svg/symbols/dot-usd.svg' +import cryDSHUSD from 'images/svg/symbols/dsh-usd1.svg' +import cryEOSUSD from 'images/svg/symbols/eos-usd1.svg' +import cryETCUSD from 'images/svg/symbols/etc-usd.svg' +import cryETHUSD from 'images/svg/symbols/eth-usd.svg' +import cryFILUSD from 'images/svg/symbols/fil-usd.svg' +import cryIOTUSD from 'images/svg/symbols/iot-usd.svg' +import cryLNKUSD from 'images/svg/symbols/lnk-usd.svg' +import cryLTCUSD from 'images/svg/symbols/ltc-usd.svg' +import cryMKRUSD from 'images/svg/symbols/mkr-usd.svg' +import cryMTCUSD from 'images/svg/symbols/mtc-usd.svg' +import cryNEOUSD from 'images/svg/symbols/neo-usd.svg' +import cryOMGUSD from 'images/svg/symbols/omg-usd.svg' +import crySOLUSD from 'images/svg/symbols/sol-usd.svg' +import cryTRXUSD from 'images/svg/symbols/trx-usd.svg' +import cryUNIUSD from 'images/svg/symbols/uni-usd.svg' +import cryXLMUSD from 'images/svg/symbols/xlm-usd.svg' +import cryXMRUSD from 'images/svg/symbols/xmr-usd.svg' +import cryXRPUSD from 'images/svg/symbols/xrp-usd1.svg' +import cryXTZUSD from 'images/svg/symbols/xtz-usd.svg' +import cryZECUSD from 'images/svg/symbols/zec-usd.svg' //stocks import DEADS from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-adidas-salomon.svg' import FRAIR from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-airbus.svg' @@ -60,7 +58,7 @@ import DELHAG from 'images/svg/symbols/markets-stocks-and-indices/american-stock import DEPSHG from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-porsche.svg' import DEPUMG from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-puma.svg' import USAAL from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-american-airlines-group-inc.svg' -import AAPL from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-apple.svg' +import USAAPL from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-apple.svg' import USABNB from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-airbnb.svg' import USAIG from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-american-international-group.svg' import USAMD from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-amd.svg' @@ -73,7 +71,7 @@ import USC from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/s import USCRM from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-salesforce-com-inc.svg' import USCSCO from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-cisco-systems.svg' import USDAL from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-delta-air-lines.svg' -import DIS from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-walt-disney-company.svg' +import USDIS from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-walt-disney-company.svg' import USEBAY from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-e-bay-inc.svg' import USFB from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-facebook-inc.svg' import USFDX from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-fedex.svg' @@ -101,7 +99,7 @@ import USPG from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/ import USPYPL from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-paypal.svg' import USSONY from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-sony.svg' import USTEVA from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-teva-pharmaceutical-inds.svg' -import TSLA from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-tesla-inc.svg' +import USTSLMTR from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-tesla-inc.svg' import USUBER from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-uber-technologies-inc.svg' import USVISA from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-visa.svg' import USWMT from 'images/svg/symbols/markets-stocks-and-indices/american-stocks/stocks-wal-mart-stores-inc.svg' @@ -112,19 +110,19 @@ import OTC_SX5E from 'images/svg/symbols/markets-stocks-and-indices/european-ind import OTC_FCHI from 'images/svg/symbols/markets-stocks-and-indices/european-indices/france-40.svg' import OTC_N225 from 'images/svg/symbols/markets-stocks-and-indices/asian-indices/japan-225.svg' import OTC_FTSE from 'images/svg/symbols/markets-stocks-and-indices/european-indices/uk-100.svg' -import US_100 from 'images/svg/symbols/markets-stocks-and-indices/american-indices/us-tech-100.svg' -import US_30 from 'images/svg/symbols/markets-stocks-and-indices/american-indices/wall-street-30.svg' +import OTC_NDX from 'images/svg/symbols/markets-stocks-and-indices/american-indices/us-tech-100.svg' +import OTC_DJI from 'images/svg/symbols/markets-stocks-and-indices/american-indices/wall-street-30.svg' import OTC_SPC from 'images/svg/symbols/markets-stocks-and-indices/american-indices/us-500.svg' import OTC_AS51 from 'images/svg/symbols/markets-stocks-and-indices/asian-indices/aus-200.svg' //derived import R_10 from 'images/svg/symbols/index10-new.svg' import R_25 from 'images/svg/symbols/index25-new.svg' import R_50 from 'images/svg/symbols/index50-new.svg' -import Volatility_75_Index from 'images/svg/symbols/index75-new.svg' +import R_75 from 'images/svg/symbols/index75-new.svg' import R_100 from 'images/svg/symbols/index100-new.svg' import stpRNG from 'images/svg/symbols/step-indices-new.svg' import RB100 from 'images/svg/symbols/rb-100-new.svg' -import Range_Break_200_Index from 'images/svg/symbols/rb-200-new.svg' +import RB200 from 'images/svg/symbols/rb-200-new.svg' import Vol_1HZ10V from 'images/svg/symbols/index10s1-new.svg' import Vol_1HZ25V from 'images/svg/symbols/index25s1-new.svg' import Vol_1HZ50V from 'images/svg/symbols/index50s1-new.svg' @@ -134,12 +132,12 @@ import Vol_1HZ200V from 'images/svg/symbols/volatility_200_1s.svg' import Vol_1HZ300V from 'images/svg/symbols/volatility_300_1s.svg' import BOOM1000 from 'images/svg/symbols/boom-indices-1000-new.svg' import BOOM500 from 'images/svg/symbols/boom-indices-500-new.svg' -import Crash_1000_Index from 'images/svg/symbols/crash-indices-1000-new.svg' +import CRASH1000 from 'images/svg/symbols/crash-indices-1000-new.svg' import CRASH500 from 'images/svg/symbols/crash-indices-500-new.svg' import JD10 from 'images/svg/symbols/jump-10-new.svg' import JD100 from 'images/svg/symbols/jump-100-new.svg' import JD25 from 'images/svg/symbols/jump-25-new.svg' -import Jump_50_Index from 'images/svg/symbols/jump-50-new.svg' +import JD50 from 'images/svg/symbols/jump-50-new.svg' import JD75 from 'images/svg/symbols/jump-75-new.svg' import WLDAUD from 'images/svg/symbols/aud-basket.svg' import WLDEUR from 'images/svg/symbols/eur-basket.svg' @@ -150,94 +148,94 @@ import USDJPYDFX10 from 'images/svg/symbols/usd-jpy-10.svg' import GBPUSDDFX10 from 'images/svg/symbols/gbp-usd-10.svg' import AUDUSDDFX10 from 'images/svg/symbols/aud-usd-10.svg' import USDCHFDFX10 from 'images/svg/symbols/usd-chf-10.svg' -import EURUSD_DFX_10_Index from 'images/svg/symbols/eur-usd-10.svg' -import Boom_300_Index from 'images/svg/symbols/boom-eu-boom-300.svg' -import Crash_300_Index from 'images/svg/symbols/crash-eu-crash-300.svg' +import EURUSDDFX10 from 'images/svg/symbols/eur-usd-10.svg' +import BOOM300 from 'images/svg/symbols/boom-eu-boom-300.svg' +import CRASH300 from 'images/svg/symbols/crash-eu-crash-300.svg' //forex -import AUDJPY from 'images/svg/symbols/aud-jpy.svg' -import AUDUSD from 'images/svg/symbols/aud-usd.svg' -import EURAUD from 'images/svg/symbols/eur-aud.svg' -import EURCAD from 'images/svg/symbols/eur-cad.svg' -import EURCHF from 'images/svg/symbols/eur-chf.svg' -import EURGBP from 'images/svg/symbols/eur-gbp.svg' -import EURJPY from 'images/svg/symbols/eur-jpy.svg' -import EURUSD from 'images/svg/symbols/eur-usd.svg' -import GBPAUD from 'images/svg/symbols/gbp-aud.svg' -import GBPJPY from 'images/svg/symbols/gbp-jpy.svg' -import GBPUSD from 'images/svg/symbols/gbp-usd.svg' -import USDCAD from 'images/svg/symbols/usd-cad.svg' -import USDCHF from 'images/svg/symbols/usd-chf.svg' -import USDJPY from 'images/svg/symbols/usd-jpy.svg' -import AUDCAD from 'images/svg/symbols/aud-cad.svg' -import AUDCHF from 'images/svg/symbols/aud-chf.svg' -import AUDNZD from 'images/svg/symbols/aud-nzd.svg' -import CADCHF from 'images/svg/symbols/cad-chf.svg' -import CADJPY from 'images/svg/symbols/cad-jpy.svg' -import CHFJPY from 'images/svg/symbols/chf-jpy.svg' -import EURNOK from 'images/svg/symbols/eur-nok.svg' -import EURNZD from 'images/svg/symbols/eur-nzd.svg' -import EURPLN from 'images/svg/symbols/eur-pln.svg' -import EURSEK from 'images/svg/symbols/eur-sek.svg' -import GBPCAD from 'images/svg/symbols/gbp-cad.svg' -import GBPCHF from 'images/svg/symbols/gbp-chf.svg' -import GBPNOK from 'images/svg/symbols/gbp-nok.svg' -import GBPNZD from 'images/svg/symbols/gbp-nzd.svg' -import GBPSEK from 'images/svg/symbols/gbp-sek.svg' -import NZDCAD from 'images/svg/symbols/nzd-cad.svg' -import NZDJPY from 'images/svg/symbols/nzd-jpy.svg' -import NZDUSD from 'images/svg/symbols/nzd-usd.svg' -import USDCNH from 'images/svg/symbols/usd-cnh.svg' -import USDMXN from 'images/svg/symbols/usd-mxn.svg' -import USDNOK from 'images/svg/symbols/usd-nok.svg' -import USDPLN from 'images/svg/symbols/usd-pln.svg' -import USDSEK from 'images/svg/symbols/usd-sek.svg' -import USDZAR from 'images/svg/symbols/usd-zar.svg' +import frxAUDJPY from 'images/svg/symbols/aud-jpy.svg' +import frxAUDUSD from 'images/svg/symbols/aud-usd.svg' +import frxEURAUD from 'images/svg/symbols/eur-aud.svg' +import frxEURCAD from 'images/svg/symbols/eur-cad.svg' +import frxEURCHF from 'images/svg/symbols/eur-chf.svg' +import frxEURGBP from 'images/svg/symbols/eur-gbp.svg' +import frxEURJPY from 'images/svg/symbols/eur-jpy.svg' +import frxEURUSD from 'images/svg/symbols/eur-usd.svg' +import frxGBPAUD from 'images/svg/symbols/gbp-aud.svg' +import frxGBPJPY from 'images/svg/symbols/gbp-jpy.svg' +import frxGBPUSD from 'images/svg/symbols/gbp-usd.svg' +import frxUSDCAD from 'images/svg/symbols/usd-cad.svg' +import frxUSDCHF from 'images/svg/symbols/usd-chf.svg' +import frxUSDJPY from 'images/svg/symbols/usd-jpy.svg' +import frxAUDCAD from 'images/svg/symbols/aud-cad.svg' +import frxAUDCHF from 'images/svg/symbols/aud-chf.svg' +import frxAUDNZD from 'images/svg/symbols/aud-nzd.svg' +import frxCADCHF from 'images/svg/symbols/cad-chf.svg' +import frxCADJPY from 'images/svg/symbols/cad-jpy.svg' +import frxCHFJPY from 'images/svg/symbols/chf-jpy.svg' +import frxEURNOK from 'images/svg/symbols/eur-nok.svg' +import frxEURNZD from 'images/svg/symbols/eur-nzd.svg' +import frxEURPLN from 'images/svg/symbols/eur-pln.svg' +import frxEURSEK from 'images/svg/symbols/eur-sek.svg' +import frxGBPCAD from 'images/svg/symbols/gbp-cad.svg' +import frxGBPCHF from 'images/svg/symbols/gbp-chf.svg' +import frxGBPNOK from 'images/svg/symbols/gbp-nok.svg' +import frxGBPNZD from 'images/svg/symbols/gbp-nzd.svg' +import frxGBPSEK from 'images/svg/symbols/gbp-sek.svg' +import frxNZDCAD from 'images/svg/symbols/nzd-cad.svg' +import frxNZDJPY from 'images/svg/symbols/nzd-jpy.svg' +import frxNZDUSD from 'images/svg/symbols/nzd-usd.svg' +import frxUSDCNH from 'images/svg/symbols/usd-cnh.svg' +import frxUSDMXN from 'images/svg/symbols/usd-mxn.svg' +import frxUSDNOK from 'images/svg/symbols/usd-nok.svg' +import frxUSDPLN from 'images/svg/symbols/usd-pln.svg' +import frxUSDSEK from 'images/svg/symbols/usd-sek.svg' +import frxUSDZAR from 'images/svg/symbols/usd-zar.svg' export { WTI_OIL, CL_BRENT, XAGEUR, - XAGUSD, + frxXAGUSD, XAUEUR, XALUSD, - XCUUSD, - XAUUSD, + frxXCUUSD, + frxXAUUSD, XNIUSD, XPBUSD, - XPDUSD, - XPTUSD, + frxXPDUSD, + frxXPTUSD, XZNUSD, - ADAUSD, - ALGUSD, - AVAUSD, - BATUSD, - BCHUSD, - BNBUSD, - BTCETH, - BTCLTC, - BTCUSD, - DOGUSD, - DOTUSD, - DSHUSD, - EOSUSD, - ETCUSD, - ETHUSD, - FILUSD, - IOTUSD, - LNKUSD, - LTCUSD, - MKRUSD, - MTCUSD, - NEOUSD, - OMGUSD, - SOLUSD, - TRXUSD, - UNIUSD, - XLMUSD, - XMRUSD, - XRPUSD, - XTZUSD, - ZECUSD, + cryADAUSD, + cryALGUSD, + cryAVAUSD, + cryBATUSD, + cryBCHUSD, + cryBNBUSD, + cryBTCETH, + cryBTCLTC, + cryBTCUSD, + cryDOGUSD, + cryDOTUSD, + cryDSHUSD, + cryEOSUSD, + cryETCUSD, + cryETHUSD, + cryFILUSD, + cryIOTUSD, + cryLNKUSD, + cryLTCUSD, + cryMKRUSD, + cryMTCUSD, + cryNEOUSD, + cryOMGUSD, + crySOLUSD, + cryTRXUSD, + cryUNIUSD, + cryXLMUSD, + cryXMRUSD, + cryXRPUSD, + cryXTZUSD, + cryZECUSD, DEADS, FRAIR, FRAIRF, @@ -249,7 +247,7 @@ export { DEPSHG, DEPUMG, USAAL, - AAPL, + USAAPL, USABNB, USAIG, USAMD, @@ -262,7 +260,7 @@ export { USCRM, USCSCO, USDAL, - DIS, + USDIS, USEBAY, USFB, USFDX, @@ -290,7 +288,7 @@ export { USPYPL, USSONY, USTEVA, - TSLA, + USTSLMTR, USUBER, USVISA, USWMT, @@ -301,18 +299,18 @@ export { OTC_FCHI, OTC_N225, OTC_FTSE, - US_100, - US_30, + OTC_NDX, + OTC_DJI, OTC_SPC, OTC_AS51, R_10, R_25, R_50, - Volatility_75_Index, + R_75, R_100, stpRNG, RB100, - Range_Break_200_Index, + RB200, Vol_1HZ10V, Vol_1HZ25V, Vol_1HZ50V, @@ -324,14 +322,14 @@ export { Vol_1HZ250V, BOOM1000, BOOM500, - Boom_300_Index, - Crash_300_Index, - Crash_1000_Index, + BOOM300, + CRASH300, + CRASH1000, CRASH500, JD10, JD100, JD25, - Jump_50_Index, + JD50, JD75, WLDAUD, WLDEUR, @@ -342,44 +340,43 @@ export { GBPUSDDFX10, AUDUSDDFX10, USDCHFDFX10, - EURUSD_DFX_10_Index, - AUDJPY, - AUDUSD, - EURAUD, - EURCAD, - EURCHF, - EURGBP, - EURJPY, - EURUSD, - GBPAUD, - GBPJPY, - GBPUSD, - USDCAD, - USDCHF, - USDJPY, - AUDCAD, - AUDCHF, - AUDNZD, - CADCHF, - CADJPY, - CHFJPY, - EURNOK, - EURNZD, - EURPLN, - EURSEK, - GBPCAD, - GBPCHF, - GBPNOK, - GBPNZD, - GBPSEK, - NZDCAD, - NZDJPY, - NZDUSD, - USDCNH, - USDMXN, - USDNOK, - USDPLN, - USDSEK, - USDZAR, - ETFSICON, + EURUSDDFX10, + frxAUDJPY, + frxAUDUSD, + frxEURAUD, + frxEURCAD, + frxEURCHF, + frxEURGBP, + frxEURJPY, + frxEURUSD, + frxGBPAUD, + frxGBPJPY, + frxGBPUSD, + frxUSDCAD, + frxUSDCHF, + frxUSDJPY, + frxAUDCAD, + frxAUDCHF, + frxAUDNZD, + frxCADCHF, + frxCADJPY, + frxCHFJPY, + frxEURNOK, + frxEURNZD, + frxEURPLN, + frxEURSEK, + frxGBPCAD, + frxGBPCHF, + frxGBPNOK, + frxGBPNZD, + frxGBPSEK, + frxNZDCAD, + frxNZDJPY, + frxNZDUSD, + frxUSDCNH, + frxUSDMXN, + frxUSDNOK, + frxUSDPLN, + frxUSDSEK, + frxUSDZAR, } diff --git a/src/components/hooks/use-pricing-feed.tsx b/src/components/hooks/use-pricing-feed.tsx index 36d4b1b892e..fdd1f25a84f 100644 --- a/src/components/hooks/use-pricing-feed.tsx +++ b/src/components/hooks/use-pricing-feed.tsx @@ -13,7 +13,7 @@ const usePricingFeed = () => { const app = initializeApp(firebaseConfig) const db = getDatabase(app) - const commoditiesRef = ref(db, is_eu ? 'eu/mkt' : 'row/mkt') + const commoditiesRef = ref(db, is_eu ? 'eu/market' : 'row/market') const unsubscribe = onValue( commoditiesRef, (snapshot) => { diff --git a/src/features/components/templates/footer/disclaimer/data.tsx b/src/features/components/templates/footer/disclaimer/data.tsx index 6fd3e3e903a..66bf10c0a2f 100644 --- a/src/features/components/templates/footer/disclaimer/data.tsx +++ b/src/features/components/templates/footer/disclaimer/data.tsx @@ -6,7 +6,7 @@ export const disclaimerContent: SmartDisclaimerParagraph[] = [ { id: 0, data: { - text: '_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence). Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiary with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_', + text: '_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act <0>(licence). Deriv.com Limited is the holding company for the above subsidiary with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_', components: [ licence). Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<1>licence). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<2>licence). Deriv (V) Ltd is licensed and regulated by the Vanuatu Financial Services Commission (<3>licence). Deriv (SVG) LLC has a registered office at Hinds Buildings, Kingstown, St. Vincent and the Grenadines. Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_', + text: '_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence). Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<1>licence). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<2>licence). Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<3>licence). Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_', components: [ licence). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<1>licence). Deriv (V) Ltd is licensed and regulated by the Vanuatu Financial Services Commission (<2>licence). Deriv (SVG) LLC has a registered office at Hinds Buildings, Kingstown, St. Vincent and the Grenadines. Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_', + text: '_t_Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<0>licence). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<1>licence). Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<2>licence). Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_', components: [ { return ( + + + + + { - const [selected_market, setSelectedMarket] = useState('fx') + const [selected_market, setSelectedMarket] = useState('forex') const [tab_name, setTabName] = useState('Forex') const [linkToMarketPage, setLinkToMarketPage] = useState('/markets/forex/') - const { is_eu } = useRegion() - const updated_market_buttons = market_buttons.filter((items) => { - if (!is_eu) return items - if (is_eu && items.market_name !== 'etfs') return items - }) - const onMarketButtonClick = (selected) => { setSelectedMarket(selected) } + return ( { padding_block="10x" md={{ justify: 'center', padding: '10x' }} > - {updated_market_buttons.map((market_item) => ( + {market_buttons.map((market_item) => ( { ), )} + ) diff --git a/src/features/pages/home/live-pricing/market-tabs/utils.tsx b/src/features/pages/home/live-pricing/market-tabs/utils.tsx index 15e96ea1195..5fd8cad27ea 100644 --- a/src/features/pages/home/live-pricing/market-tabs/utils.tsx +++ b/src/features/pages/home/live-pricing/market-tabs/utils.tsx @@ -2,13 +2,11 @@ import { TMarketButtons } from '../types' import Forex from 'images/svg/home/ts_fx_icon.svg' import Derived from 'images/svg/home/ts_derived_icon.svg' import Stocks from 'images/svg/home/ts_stocks_icon.svg' -import ETFS from 'images/svg/home/ts_etfs.svg' import Crypto from 'images/svg/home/ts_crypto_icon.svg' import Commodities from 'images/svg/home/ts_commodities_icon.svg' import SelectedForex from 'images/svg/home/selected_ts_fx_icon.svg' import SelectedDerived from 'images/svg/home/selected_ts_derived_icon.svg' import SelectedStocks from 'images/svg/home/selected_ts_stocks_icon.svg' -import SelectedETFS from 'images/svg/home/selected_etfs.svg' import SelectedCrypto from 'images/svg/home/selected_ts_crypto_icon.svg' import SelectedCommodities from 'images/svg/home/selected_ts_commodities_icon.svg' @@ -17,7 +15,7 @@ export const market_buttons: TMarketButtons[] = [ src: Forex, selected_src: SelectedForex, button_text: 'Forex', - market_name: 'fx', + market_name: 'forex', market_description: '_t_Benefit from round-the-clock trading hours (Monday to Friday), high liquidity, low barriers to entry, a wide range of offerings, and opportunities to trade on world events._t_', to: '/markets/forex/', @@ -26,7 +24,7 @@ export const market_buttons: TMarketButtons[] = [ src: Derived, selected_src: SelectedDerived, button_text: 'Derived indices', - market_name: 'der', + market_name: 'derived', market_description: '_t_Trade on asset prices derived from real-world or simulated markets. Manage your exposure by selecting the volatility level to suit your risk appetite. Choose from our 24/7 synthetics, derived FX, and baskets._t_', to: '/markets/synthetic/', @@ -35,25 +33,16 @@ export const market_buttons: TMarketButtons[] = [ src: Stocks, selected_src: SelectedStocks, button_text: 'Stocks & indices', - market_name: 'ind', + market_name: 'indices', market_description: '_t_Trade global stocks of your favourite household brands and international stock market indices on Deriv. Expand your trading opportunities with access to a wide range of stocks and indices at competitive prices, and the convenience to trade indices beyond standard market hours._t_', to: '/markets/stock/', }, - { - src: ETFS, - selected_src: SelectedETFS, - button_text: 'ETFs', - market_name: 'etfs', - market_description: - '_t_Speculate on the price movements of popular exchange-traded funds (ETFs). Diversify your portfolio with assets that track bonds, commodities, and indices, without the high cost of owning the underlying assets._t_', - to: '/markets/exchange-traded-funds/', - }, { src: Crypto, selected_src: SelectedCrypto, button_text: 'Cryptocurrencies', - market_name: 'cry', + market_name: 'cryptocurrency', market_description: "_t_Take advantage of a highly liquid market with round-the-clock trading. Profit from correctly predicting the movement of world's most popular cryptocurrencies._t_", to: '/markets/cryptocurrencies/', @@ -62,7 +51,7 @@ export const market_buttons: TMarketButtons[] = [ src: Commodities, selected_src: SelectedCommodities, button_text: 'Commodities', - market_name: 'com', + market_name: 'commodities', market_description: '_t_Speculate on the price movements of silver, gold, oil and more. Profit from the price difference when the market moves in the direction that you have predicted._t_', to: '/markets/commodities/', diff --git a/src/features/pages/home/live-pricing/table-component/live-market-table.tsx b/src/features/pages/home/live-pricing/table-component/live-market-table.tsx index 75a64807cf1..c609b2a9172 100644 --- a/src/features/pages/home/live-pricing/table-component/live-market-table.tsx +++ b/src/features/pages/home/live-pricing/table-component/live-market-table.tsx @@ -49,12 +49,13 @@ const LiveMarketTable = ({ selected_market, link_to }: TLiveMarketTableProps) => const [error, rawMarketsData] = usePricingFeed() const TABLE_VISIBLE_ROWS = 5 const [sorting, setSorting] = React.useState([]) + const markets_data = useMemo(() => { if (rawMarketsData) { - const stocks = rawMarketsData['stk'] - const indices = rawMarketsData['ind'] + const stocks = rawMarketsData['stocks'] + const indices = rawMarketsData['indices'] const stocks_indices = { ...stocks, ...indices } - const res = { ...rawMarketsData, ind: stocks_indices } + const res = { ...rawMarketsData, indices: stocks_indices } if (res[selected_market]) { return Object.values(res[selected_market]) diff --git a/src/features/pages/home/live-pricing/table-component/live-pricing.module.scss b/src/features/pages/home/live-pricing/table-component/live-pricing.module.scss index 049137385ca..327b3eac476 100644 --- a/src/features/pages/home/live-pricing/table-component/live-pricing.module.scss +++ b/src/features/pages/home/live-pricing/table-component/live-pricing.module.scss @@ -10,7 +10,7 @@ align-items: center; min-block-size: 7.5rem; th { - padding: 1rem; + padding-block: 0; inline-size: 7.3rem; &:nth-child(1) { inline-size: 11rem; @@ -63,7 +63,7 @@ gap: 1rem; td { - padding: 1rem; + padding-block: 1rem; display: flex; justify-content: center; inline-size: 6.9rem; @@ -80,7 +80,6 @@ } } @include breakpoints(phone) { - padding: 2rem; gap: 0; td { justify-content: flex-start; @@ -98,7 +97,7 @@ } } @include breakpoints(laptop) { - padding: 2rem; + padding: 1rem; gap: 0; td { justify-content: flex-start; @@ -116,3 +115,8 @@ } } } + + + + + diff --git a/src/features/pages/home/live-pricing/table-component/symbol-icon.tsx b/src/features/pages/home/live-pricing/table-component/symbol-icon.tsx index b968d1ac64d..6b769b1fbee 100644 --- a/src/features/pages/home/live-pricing/table-component/symbol-icon.tsx +++ b/src/features/pages/home/live-pricing/table-component/symbol-icon.tsx @@ -3,9 +3,9 @@ import * as icons from 'components/elements/symbols-shortcode' import Image from 'features/components/atoms/image' const SymbolIcon = ({ icon_src }: { icon_src: string }) => { - if (icon_src === 'Volatility_150_(1s)_Index') + if (icon_src === '1HZ150V') return - if (icon_src === 'Volatility_250_(1s)_Index') + if (icon_src === '1HZ250V') return else return } diff --git a/src/features/pages/home/live-pricing/types.tsx b/src/features/pages/home/live-pricing/types.tsx index 33d0f4d5888..3b0c30fe26d 100644 --- a/src/features/pages/home/live-pricing/types.tsx +++ b/src/features/pages/home/live-pricing/types.tsx @@ -3,14 +3,25 @@ import { TString } from 'types/generics' export type TMarketData = { ask: number bid: number - chng: number - mkt: string - sprd: number - sym: string - code: string + day_percentage_change: number + market: string + spread: number + symbol: string + shortcode: string } -export type TAvailableLiveMarkets = 'fx' | 'der' | 'ind' | 'cry' | 'com' | 'etfs' +export type TMarketDataResponse = { + trading_platform_asset_listing: any + active_symbols: TMarketData[] + req_id: number +} + +export type TAvailableLiveMarkets = + | 'forex' + | 'derived' + | 'indices' + | 'cryptocurrency' + | 'commodities' export type TMarketButtons = { src: string diff --git a/src/features/pages/home/live-pricing/use-live-columns.tsx b/src/features/pages/home/live-pricing/use-live-columns.tsx index cfdd43ca4fa..f6b1a53ad9d 100644 --- a/src/features/pages/home/live-pricing/use-live-columns.tsx +++ b/src/features/pages/home/live-pricing/use-live-columns.tsx @@ -11,10 +11,9 @@ const liveMarketColumnHelper = createColumnHelper() const useLiveColumns = () => { const { is_mobile } = useBreakpoints() - const columns = useMemo(() => { return [ - liveMarketColumnHelper.accessor('code', { + liveMarketColumnHelper.accessor('shortcode', { header: () => ( { ), cell: (info) => ( - {info.row.original.mkt !== 'etfs' ? ( - - ) : ( - - )} + ), }), - liveMarketColumnHelper.accessor('sym', { + liveMarketColumnHelper.accessor('symbol', { header: () => , cell: (info) => ( @@ -89,7 +84,7 @@ const useLiveColumns = () => { ), }), - liveMarketColumnHelper.accessor('sprd', { + liveMarketColumnHelper.accessor('spread', { header: () => ( { ), }), - liveMarketColumnHelper.accessor('chng', { + liveMarketColumnHelper.accessor('day_percentage_change', { header: () => ( { + return ( + + + + + + + + + + + ) +} + +export default CheckTrading diff --git a/src/features/pages/markets/etf/check-trading/styles.module.scss b/src/features/pages/markets/etf/check-trading/styles.module.scss new file mode 100644 index 00000000000..18775529cbe --- /dev/null +++ b/src/features/pages/markets/etf/check-trading/styles.module.scss @@ -0,0 +1,10 @@ +@use 'features/styles/theme/theme-mixins' as *; +@import 'features/styles/theme/variables'; + +.item_container { + box-shadow: rgba(0, 0, 0, 0.1) 0 0 3px 0; + + @include breakpoints(tablet) { + box-shadow: none; + } +} diff --git a/src/features/pages/markets/etf/index.tsx b/src/features/pages/markets/etf/index.tsx index 723109bb566..72c7c79292a 100644 --- a/src/features/pages/markets/etf/index.tsx +++ b/src/features/pages/markets/etf/index.tsx @@ -5,6 +5,7 @@ import Banner from './banner' import InstrumentsTable from './instruments' import InstrumentsContent from './instrumental-content' import TradeTypes from './trades-available' +import CheckTrading from './check-trading' import SignupPublic from 'features/components/templates/signup/with-banner' import Flex from 'features/components/atoms/flex-box' import OtherMarketsSlider from 'features/components/molecules/other-markets-slider' @@ -24,10 +25,12 @@ const ETFMarket = () => { direction="col" as="section" padding_inline="8x" + md={{ pb: '20x' }} > + diff --git a/src/features/pages/markets/etf/instrumental-content/index.tsx b/src/features/pages/markets/etf/instrumental-content/index.tsx index fd66ddd5c2f..f76a5a1a8fb 100644 --- a/src/features/pages/markets/etf/instrumental-content/index.tsx +++ b/src/features/pages/markets/etf/instrumental-content/index.tsx @@ -11,13 +11,14 @@ const InstrumentsContent = () => { {instrumental_content.map((data) => ( diff --git a/src/images/common/regulatory/bvi.png b/src/images/common/regulatory/bvi.png deleted file mode 100644 index efa91305035..00000000000 Binary files a/src/images/common/regulatory/bvi.png and /dev/null differ diff --git a/src/images/common/regulatory/bvi.svg b/src/images/common/regulatory/bvi.svg new file mode 100644 index 00000000000..6889af88ae4 --- /dev/null +++ b/src/images/common/regulatory/bvi.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/common/regulatory/deriv.png b/src/images/common/regulatory/deriv.png deleted file mode 100644 index 6db1fcefd6d..00000000000 Binary files a/src/images/common/regulatory/deriv.png and /dev/null differ diff --git a/src/images/common/regulatory/deriv.svg b/src/images/common/regulatory/deriv.svg new file mode 100644 index 00000000000..37a1a04dbe5 --- /dev/null +++ b/src/images/common/regulatory/deriv.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/images/common/regulatory/labuan-fintech.png b/src/images/common/regulatory/labuan-fintech.png deleted file mode 100644 index cb657f650d5..00000000000 Binary files a/src/images/common/regulatory/labuan-fintech.png and /dev/null differ diff --git a/src/images/common/regulatory/labuan-fintech.svg b/src/images/common/regulatory/labuan-fintech.svg new file mode 100644 index 00000000000..97d0046f428 --- /dev/null +++ b/src/images/common/regulatory/labuan-fintech.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/images/common/regulatory/labuan.png b/src/images/common/regulatory/labuan.png deleted file mode 100644 index 4e3c703c3bc..00000000000 Binary files a/src/images/common/regulatory/labuan.png and /dev/null differ diff --git a/src/images/common/regulatory/labuan.svg b/src/images/common/regulatory/labuan.svg new file mode 100644 index 00000000000..9cb5d11ffd9 --- /dev/null +++ b/src/images/common/regulatory/labuan.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/images/common/regulatory/tfc.png b/src/images/common/regulatory/tfc.png deleted file mode 100644 index 8b21a8fe5ad..00000000000 Binary files a/src/images/common/regulatory/tfc.png and /dev/null differ diff --git a/src/images/common/regulatory/tfc.svg b/src/images/common/regulatory/tfc.svg new file mode 100644 index 00000000000..2a945ab143c --- /dev/null +++ b/src/images/common/regulatory/tfc.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/common/regulatory/vanuatu-fma.png b/src/images/common/regulatory/vanuatu-fma.png deleted file mode 100644 index c8e10d68aec..00000000000 Binary files a/src/images/common/regulatory/vanuatu-fma.png and /dev/null differ diff --git a/src/images/common/regulatory/vanuatu-fma.svg b/src/images/common/regulatory/vanuatu-fma.svg new file mode 100644 index 00000000000..17a1437ac2b --- /dev/null +++ b/src/images/common/regulatory/vanuatu-fma.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/common/regulatory/vanuatu.png b/src/images/common/regulatory/vanuatu.png deleted file mode 100644 index fda61cb5fb6..00000000000 Binary files a/src/images/common/regulatory/vanuatu.png and /dev/null differ diff --git a/src/images/common/regulatory/vanuatu.svg b/src/images/common/regulatory/vanuatu.svg new file mode 100644 index 00000000000..527af629ab5 --- /dev/null +++ b/src/images/common/regulatory/vanuatu.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/images/svg/regulatory/europe-map.svg b/src/images/svg/regulatory/europe-map.svg index a2ac0d58016..c7d8cca9e26 100644 --- a/src/images/svg/regulatory/europe-map.svg +++ b/src/images/svg/regulatory/europe-map.svg @@ -1 +1,110 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/svg/regulatory/pdf-icon-black.svg b/src/images/svg/regulatory/pdf-icon-black.svg index ec8f0e6d2a1..6b5275e7d20 100644 --- a/src/images/svg/regulatory/pdf-icon-black.svg +++ b/src/images/svg/regulatory/pdf-icon-black.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/src/images/svg/regulatory/svg.svg b/src/images/svg/regulatory/svg.svg index f42e994c4fb..ef7ea60f2f2 100644 --- a/src/images/svg/regulatory/svg.svg +++ b/src/images/svg/regulatory/svg.svg @@ -1 +1,30 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/svg/symbols/etf-usd-500.svg b/src/images/svg/symbols/etf-usd-500.svg deleted file mode 100644 index acd52e8834b..00000000000 --- a/src/images/svg/symbols/etf-usd-500.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/pages/help-centre/data/_account.ts b/src/pages/help-centre/data/_account.ts index df3a4941247..d59f77cee66 100644 --- a/src/pages/help-centre/data/_account.ts +++ b/src/pages/help-centre/data/_account.ts @@ -143,23 +143,6 @@ const account: TQuestionsData = { category: 'account', sub_category: '_t_Managing your account_t_', label: 'change-my-email-address', - hide_for_non_eu: true, - answer: [ - { - translation_text: - "_t_Yes. <0>Contact us via live chat and we'll help you with it._t_", - translation_components: [ - { key: 0, type: 'link', to: '/contact_us/?is_livechat' }, - ], - }, - ], - }, - { - question: '_t_Can I change my email address?_t_', - category: 'account', - sub_category: '_t_Managing your account_t_', - label: 'change-my-email-address', - hide_for_eu: true, answer: [ { translation_text: diff --git a/src/pages/regulatory/_document_accordion.tsx b/src/pages/regulatory/_document_accordion.tsx index 86777f2abd3..7de6f2f3644 100644 --- a/src/pages/regulatory/_document_accordion.tsx +++ b/src/pages/regulatory/_document_accordion.tsx @@ -21,19 +21,11 @@ const FlexText = styled(LinkText)` @media ${device.laptopM} { width: 40%; } - @media ${device.tabletS} { + @media (max-width: 685px) { width: 80%; justify-content: flex-start; - padding-left: 15rem; - } - @media (max-width: 500px) { - padding-left: 8.5rem; - } - @media ${device.mobileM} { - padding-left: 6rem; - } - @media ${device.mobileS} { - padding-left: 4.5rem; + padding-left: 0; + margin-inline: 0; } ` @@ -49,21 +41,13 @@ const FlexText_Pillar = styled(LinkText)` const EdgeFlex = styled(Flex)` flex-wrap: wrap; justify-content: flex-start; - margin-left: 5%; /* Edge does not support space-evenly */ @supports (-ms-ime-align: auto) { justify-content: space-around; } - @media ${device.laptopM} { - margin-left: 9%; - } - @media ${device.tabletL} { - margin-left: 18%; - } @media ${device.tabletS} { flex-direction: column; - margin-left: 10%; } ` @@ -170,7 +154,7 @@ const DocumentAccordion = (locale: DocumentAccordionProps) => { ? selected_language + '/' : '' }${data.ref}`} - m="1.6rem 2.4rem" + m="1.6rem 1.4rem" > pdf icon black diff --git a/src/pages/regulatory/_eu-grid.tsx b/src/pages/regulatory/_eu-grid.tsx index 61205b3371c..eb3cbfff64f 100644 --- a/src/pages/regulatory/_eu-grid.tsx +++ b/src/pages/regulatory/_eu-grid.tsx @@ -20,6 +20,7 @@ const Country = styled.div` font-size: var(--text-size-s); color: var(--color-grey-3); align-items: center; + inline-size: 20rem; & a { display: inline; @@ -27,6 +28,11 @@ const Country = styled.div` line-height: 1rem; color: var(--color-grey-3); } + + @media (max-width: 425px) { + font-size: var(--text-size-xs); + inline-size: 16rem; + } ` const Order = styled.div` display: inline-block; diff --git a/src/pages/regulatory/index.tsx b/src/pages/regulatory/index.tsx index 2b72498e003..8c7f3c0c84d 100644 --- a/src/pages/regulatory/index.tsx +++ b/src/pages/regulatory/index.tsx @@ -19,15 +19,16 @@ import { import { Localize, WithIntl } from 'components/localization' // Icons import EU from 'images/svg/regulatory/europe-map.svg' -import Vanuatu from 'images/common/regulatory/vanuatu.png' -import VanuatuFMA from 'images/common/regulatory/vanuatu-fma.png' -import FSC from 'images/common/regulatory/bvi.png' -import Labuan from 'images/common/regulatory/labuan.png' -import LabuanFintech from 'images/common/regulatory/labuan-fintech.png' -import Deriv from 'images/common/regulatory/deriv.png' -import TFC from 'images/common/regulatory/tfc.png' +import Vanuatu from 'images/common/regulatory/vanuatu.svg' +import VanuatuFMA from 'images/common/regulatory/vanuatu-fma.svg' +import FSC from 'images/common/regulatory/bvi.svg' +import Labuan from 'images/common/regulatory/labuan.svg' +import LabuanFintech from 'images/common/regulatory/labuan-fintech.svg' +import Deriv from 'images/common/regulatory/deriv.svg' +import TFC from 'images/common/regulatory/tfc.svg' import SVG from 'images/svg/regulatory/svg.svg' import device from 'themes/device' +import useBreakpoints from 'components/hooks/use-breakpoints' import { TGatsbyHead } from 'features/types' import InitialLoader from 'components/elements/dot-loader' @@ -115,6 +116,7 @@ const StyledLinkText = styled(LinkText)` const Regulatory = (locale: RegulatoryProps) => { const { is_row, is_cpa_plan, is_region_loading } = useRegion() + const { is_mobile } = useBreakpoints() return ( @@ -131,7 +133,7 @@ const Regulatory = (locale: RegulatoryProps) => { padding="1.6rem 0 2rem" maxwidth="792px" > - + { weight="normal" maxwidth="792px" > - + - {!is_region_loading ? ( - is_row || is_cpa_plan ? ( - - - - - - -
- , - ]} - /> -
- - - - ) : ( + is_row || is_cpa_plan ? null : ( <> @@ -192,11 +164,11 @@ const Regulatory = (locale: RegulatoryProps) => {
{
@@ -262,7 +234,8 @@ const Regulatory = (locale: RegulatoryProps) => { ) : ( )} - + + { tablet_columns="1fr 5fr" mobile_columns="1fr" > + {is_row || is_cpa_plan ? ( + <> + + + + + + + + + + + + + + + , + ]} + /> + + + + ) : null} + @@ -289,7 +294,7 @@ const Regulatory = (locale: RegulatoryProps) => { { /> - + @@ -330,7 +335,7 @@ const Regulatory = (locale: RegulatoryProps) => { { { /> - + @@ -404,7 +409,7 @@ const Regulatory = (locale: RegulatoryProps) => { - + @@ -414,7 +419,7 @@ const Regulatory = (locale: RegulatoryProps) => { - + Deriv Limited @@ -422,18 +427,19 @@ const Regulatory = (locale: RegulatoryProps) => { - + - + - + + { - + { -