diff --git a/.github/workflows/generate-preview-link.yml b/.github/workflows/generate-preview-link.yml index a75f95f3b24..2c4f765b6d6 100644 --- a/.github/workflows/generate-preview-link.yml +++ b/.github/workflows/generate-preview-link.yml @@ -28,6 +28,10 @@ jobs: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' steps: + - name: Checkout to repo + uses: actions/checkout@v3 + with: + ref: ${{ github.event.workflow_run.head_sha }} - name: Download artifact id: download-artifact uses: dawidd6/action-download-artifact@v2 @@ -35,11 +39,12 @@ jobs: workflow_conclusion: success run_id: ${{ github.event.workflow_run.id }} name: 'pr-${{ github.event.workflow_run.id }}' + path: .pr - name: Retrieve pull request id: pr_information run: | - echo "issue_number=$(cat ./NR)" > $GITHUB_OUTPUT + echo "issue_number=$(cat .pr/NR)" >> $GITHUB_OUTPUT - name: 'Generate action link comment' id: generate_action_url @@ -69,14 +74,14 @@ jobs: id: verify_user_organization run: | echo "Verifying user's organization..." - user=$(cat ./USERNAME) + user=$(cat .pr/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") - + -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 @@ -84,11 +89,6 @@ jobs: 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 @@ -136,15 +136,18 @@ jobs: projectName='deriv-com-preview-links' head_branch=${{github.event.workflow_run.head_branch}} branch=$(echo $head_branch | head -c 20 | sed 's/[\/_\.]/-/g; s/[^a-zA-Z0-9]$/1/') - preview_url=$(wrangler pages deploy $directory --project-name=$projectName --branch=$branch > log.txt 2>&1; echo $?) + cf_preview_url=$(wrangler pages deploy $directory --project-name=$projectName --branch=$branch > log.txt 2>&1; echo $?) echo "------" + preview_url=https://$branch.deriv-com-preview-links.pages.dev cat log.txt if grep -q "Deployment complete" log.txt; then - echo "preview_url=https://$branch.deriv-com-preview-links.pages.dev" > "$GITHUB_OUTPUT" + echo "preview_url=$preview_url" >> "$GITHUB_OUTPUT" + echo $preview_url > .pr/PREVIEW_URL else echo "Deployment to Cloudflare Pages failed." exit 1 fi + - name: 'Generate preview link comment' if: success() id: generate_preview_url @@ -189,3 +192,9 @@ jobs: number: ${{steps.pr_information.outputs.issue_number}} message: ${{steps.generate_preview_url.outputs.comment || steps.generate_failure_comment.outputs.comment }} recreate: true + + - name: Upload PR information to artifact + uses: actions/upload-artifact@v2 + with: + name: 'pr-${{github.run_id}}' + path: .pr diff --git a/src/pages/markets/static/content/_cfds.tsx b/src/pages/markets/static/content/_cfds.tsx index 692131d5f3c..ddbef914da1 100644 --- a/src/pages/markets/static/content/_cfds.tsx +++ b/src/pages/markets/static/content/_cfds.tsx @@ -123,7 +123,7 @@ export const synthetic_cfds: TMarketContent = { content: [ { id: 'drift-switch-indices', - title: '_t_Drift switch indices_t_', + title: '_t_Drift switching indices_t_', component: , details: , }, diff --git a/src/pages/regulatory/index.tsx b/src/pages/regulatory/index.tsx index 8c7f3c0c84d..f4e44cfc3f2 100644 --- a/src/pages/regulatory/index.tsx +++ b/src/pages/regulatory/index.tsx @@ -470,7 +470,7 @@ const Regulatory = (locale: RegulatoryProps) => { , ]} diff --git a/src/translations/ach.json b/src/translations/ach.json index b6f28a3d454..e139216ee60 100644 --- a/src/translations/ach.json +++ b/src/translations/ach.json @@ -4563,4 +4563,4 @@ "-1165835520": "crwdns3515274:0crwdne3515274:0", "-651384976": "crwdns3515276:0crwdne3515276:0", "-1033881248": "crwdns3515278:0crwdne3515278:0" -} \ No newline at end of file +} diff --git a/src/translations/ar.json b/src/translations/ar.json index e840097c0b4..93e63fed0cd 100644 --- a/src/translations/ar.json +++ b/src/translations/ar.json @@ -3757,6 +3757,7 @@ "-19213603": "معادن", "-1866629977": "الطاقة", "-2125845705": "الأزواج غير المتداولة", + "-79167584": "المؤشرات Drift switching", "-668839336": "مؤشرات DEX", "-578042544": "مؤشرات الخطوة", "-1314348105": "مؤشرات النطاق", @@ -4563,4 +4564,4 @@ "-1165835520": "موظف", "-651384976": "الجنسيات", "-1033881248": "شاهد صفقاتنا المفتوحة" -} \ No newline at end of file +} diff --git a/src/translations/bn.json b/src/translations/bn.json index a8d702c439c..814fd33a383 100644 --- a/src/translations/bn.json +++ b/src/translations/bn.json @@ -3757,6 +3757,7 @@ "-19213603": "মেটাল", "-1866629977": "এনার্জি", "-2125845705": "বহিরাগত জোড়া", + "-79167584": "Drift switching সূচক", "-668839336": "DEX সূচক", "-578042544": "স্টেপ ইনডেক্স", "-1314348105": "রেঞ্জ ব্রেক ইনডেক্স", @@ -4563,4 +4564,4 @@ "-1165835520": "কর্মচারী", "-651384976": "জাতীয়তা", "-1033881248": "আমাদের ওপেন পজিশন দেখুন" -} \ No newline at end of file +} diff --git a/src/translations/de.json b/src/translations/de.json index ac3aa80a209..4d7f56f4034 100644 --- a/src/translations/de.json +++ b/src/translations/de.json @@ -3757,6 +3757,7 @@ "-19213603": "Metalle", "-1866629977": "Energie", "-2125845705": "Exotische Paare", + "-79167584": "Drift switching indizes", "-668839336": "DEX-Indizes", "-578042544": "Step-Indizes", "-1314348105": "Range Break-Indizes", @@ -4563,4 +4564,4 @@ "-1165835520": "Mitarbeiter", "-651384976": "Nationalitäten", "-1033881248": "Sehen Sie unsere offenen Stellen" -} \ No newline at end of file +} diff --git a/src/translations/es.json b/src/translations/es.json index 4c73a156105..34662ee99e6 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -3757,6 +3757,7 @@ "-19213603": "Metales", "-1866629977": "Energía", "-2125845705": "Pares exóticos", + "-79167584": "Indices Drift Switching", "-668839336": "Índices DEX", "-578042544": "Índices Step", "-1314348105": "Índices Range Break", @@ -4563,4 +4564,4 @@ "-1165835520": "empleados", "-651384976": "nacionalidades", "-1033881248": "Vea nuestros puestos disponibles" -} \ No newline at end of file +} diff --git a/src/translations/fr.json b/src/translations/fr.json index 2d47ee473ef..63311f8e2a2 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -3757,6 +3757,7 @@ "-19213603": "Métaux", "-1866629977": "Énergie", "-2125845705": "Paires exotiques", + "-79167584": "Indices de Drift Switching", "-668839336": "Indices DEX", "-578042544": "Indices de saut", "-1314348105": "Indices Range Break", @@ -4563,4 +4564,4 @@ "-1165835520": "employés", "-651384976": "nationalités", "-1033881248": "Voir nos postes vacants" -} \ No newline at end of file +} diff --git a/src/translations/it.json b/src/translations/it.json index e43b6743e74..a6e27d350c4 100644 --- a/src/translations/it.json +++ b/src/translations/it.json @@ -3757,6 +3757,7 @@ "-19213603": "Metalli", "-1866629977": "Energia", "-2125845705": "Coppie esotiche", + "-79167584": "Indici di Drift Switching", "-668839336": "Indici DEX", "-578042544": "Indici Step", "-1314348105": "Indici Range Break", @@ -4563,4 +4564,4 @@ "-1165835520": "dipendenti", "-651384976": "nazionalità", "-1033881248": "Vedi le posizioni aperte" -} \ No newline at end of file +} diff --git a/src/translations/ko.json b/src/translations/ko.json index c07d787bcf5..f1f1bb14e4c 100644 --- a/src/translations/ko.json +++ b/src/translations/ko.json @@ -3757,6 +3757,7 @@ "-19213603": "금속류", "-1866629977": "에너지", "-2125845705": "이종 통화쌍", + "-79167584": "Drift switching 인덱스", "-668839336": "덱스 (DEX) 인덱스", "-578042544": "스텝 지수 (Step indices)", "-1314348105": "레인지 브레이크 지수 (Range break indices)", @@ -4563,4 +4564,4 @@ "-1165835520": "직원", "-651384976": "출신 국적", "-1033881248": "채용 정보 보기" -} \ No newline at end of file +} diff --git a/src/translations/pl.json b/src/translations/pl.json index 90477136579..745089afeef 100644 --- a/src/translations/pl.json +++ b/src/translations/pl.json @@ -3757,6 +3757,7 @@ "-19213603": "Metale", "-1866629977": "Energia", "-2125845705": "Pary egzotyczne", + "-79167584": "Wskaźniki Drift Switching", "-668839336": "Wskaźniki DEX", "-578042544": "Wskaźniki Step", "-1314348105": "Wskaźniki Range Break", @@ -4563,4 +4564,4 @@ "-1165835520": "pracowników", "-651384976": "narodowości", "-1033881248": "Zobacz nasze otwarte pozycje" -} \ No newline at end of file +} diff --git a/src/translations/pt.json b/src/translations/pt.json index 33d4f995a6f..db9b1ee0dbe 100644 --- a/src/translations/pt.json +++ b/src/translations/pt.json @@ -3757,6 +3757,7 @@ "-19213603": "Metais", "-1866629977": "Energia", "-2125845705": "Pares exóticos", + "-79167584": "Índices de Drift Switching", "-668839336": "Índices DEX", "-578042544": "Índices Step", "-1314348105": "Índices Range Break", @@ -4563,4 +4564,4 @@ "-1165835520": "funcionários", "-651384976": "nacionalidades", "-1033881248": "Consulte as nossas vagas" -} \ No newline at end of file +} diff --git a/src/translations/ru.json b/src/translations/ru.json index 8c5210bd67e..3a2785c2aae 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -3757,6 +3757,7 @@ "-19213603": "Металлы", "-1866629977": "Энергоносители", "-2125845705": "Экзотические пары", + "-79167584": "Drift Switching индексы", "-668839336": "Индексы DEX", "-578042544": "Индексы Step", "-1314348105": "Индексы Range Break", @@ -4563,4 +4564,4 @@ "-1165835520": "сотрудников", "-651384976": "национальностей", "-1033881248": "Смотреть вакансии" -} \ No newline at end of file +} diff --git a/src/translations/si.json b/src/translations/si.json index ec43101642b..3620b94fe29 100644 --- a/src/translations/si.json +++ b/src/translations/si.json @@ -3757,6 +3757,7 @@ "-19213603": "ලෝහ", "-1866629977": "බලශක්ති", "-2125845705": "විදේශික යුගල", + "-79167584": "Drift switching දර්ශක", "-668839336": "DEX දර්ශක", "-578042544": "පියවර දර්ශක", "-1314348105": "Range Break දර්ශක", @@ -4563,4 +4564,4 @@ "-1165835520": "සේවකයින්", "-651384976": "ජාතීන්", "-1033881248": "අපගේ විවෘත ස්ථාන බලන්න" -} \ No newline at end of file +} diff --git a/src/translations/sw.json b/src/translations/sw.json index d326a91da39..1ee5ebd94ed 100644 --- a/src/translations/sw.json +++ b/src/translations/sw.json @@ -4563,4 +4563,4 @@ "-1165835520": "employees", "-651384976": "nationalities", "-1033881248": "Angalia nafasi zetu za wazi" -} \ No newline at end of file +} diff --git a/src/translations/th.json b/src/translations/th.json index 5c8c9f4422f..c11013d36c7 100644 --- a/src/translations/th.json +++ b/src/translations/th.json @@ -3757,6 +3757,7 @@ "-19213603": "โลหะ", "-1866629977": "พลังงาน", "-2125845705": "คู่สกุลเงินเกิดใหม่", + "-79167584": "ดัชนี Drift Switching ", "-668839336": "ดัชนี DEX", "-578042544": "ดัชนี Step", "-1314348105": "ดัชนี Range Break", @@ -4563,4 +4564,4 @@ "-1165835520": "พนักงาน", "-651384976": "สัญชาติ", "-1033881248": "ดูตำแหน่งงานที่เปิดรับ" -} \ No newline at end of file +} diff --git a/src/translations/tr.json b/src/translations/tr.json index 04717cac34e..4126069f3f3 100644 --- a/src/translations/tr.json +++ b/src/translations/tr.json @@ -3757,6 +3757,7 @@ "-19213603": "Metaller", "-1866629977": "Enerji", "-2125845705": "Egzotik çiftler", + "-79167584": "Drift Switching endeksleri", "-668839336": "DEX endeksleri", "-578042544": "Step endeksleri", "-1314348105": "Range break endeksleri", @@ -4563,4 +4564,4 @@ "-1165835520": "çalışanlar", "-651384976": "milliyetler", "-1033881248": "Açık pozisyonlarımızı görün" -} \ No newline at end of file +} diff --git a/src/translations/vi.json b/src/translations/vi.json index 5faa1d646e3..616d23174e6 100644 --- a/src/translations/vi.json +++ b/src/translations/vi.json @@ -3757,6 +3757,7 @@ "-19213603": "Kim loại", "-1866629977": "Năng lượng", "-2125845705": "Cặp tiền tệ ngoại lai", + "-79167584": "Chỉ số Drift Switching", "-668839336": "Chỉ số DEX", "-578042544": "Chỉ số Step", "-1314348105": "Chỉ số Range Break", @@ -4563,4 +4564,4 @@ "-1165835520": "nhân viên", "-651384976": "dân tộc", "-1033881248": "Xem các vị trí đang tuyển" -} \ No newline at end of file +} diff --git a/src/translations/zh_cn.json b/src/translations/zh_cn.json index 5d7abeb41bf..af9dba12614 100644 --- a/src/translations/zh_cn.json +++ b/src/translations/zh_cn.json @@ -4563,4 +4563,4 @@ "-1165835520": "雇员", "-651384976": "国籍", "-1033881248": "查看空缺职位" -} \ No newline at end of file +} diff --git a/src/translations/zh_tw.json b/src/translations/zh_tw.json index 4bc3c358b91..e094d5e6728 100644 --- a/src/translations/zh_tw.json +++ b/src/translations/zh_tw.json @@ -3757,6 +3757,7 @@ "-19213603": "金屬", "-1866629977": "能源", "-2125845705": "奇異貨幣對", + "-79167584": "Drift switching 指數", "-668839336": "DEX 指數", "-578042544": "步階指數", "-1314348105": "範圍突破指數", @@ -4563,4 +4564,4 @@ "-1165835520": "僱員", "-651384976": "國籍", "-1033881248": "查看空缺職位" -} \ No newline at end of file +} diff --git a/static/regulatory/Deriv_Ltd_membership.pdf b/static/regulatory/deriv-com-ltd-membership.pdf similarity index 69% rename from static/regulatory/Deriv_Ltd_membership.pdf rename to static/regulatory/deriv-com-ltd-membership.pdf index 6c4e882e325..388618f995f 100644 Binary files a/static/regulatory/Deriv_Ltd_membership.pdf and b/static/regulatory/deriv-com-ltd-membership.pdf differ