Merge branch 'binary-com:master' into migrate_svg_to_bvi_dvl

amina-deriv · Oct 25, 2023 · 86bf0e6 · 86bf0e6
2 parents 2f9b184 + f1653a3
commit 86bf0e6
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/generate_app_id.yml b/.github/workflows/generate_app_id.yml
@@ -45,7 +45,7 @@ jobs:
 
                       - **PR**: [${{ steps.generate_app_id.outputs.pr_url }}](${{ steps.generate_app_id.outputs.pr_url }})
                       - **URLs**:
-                          - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
+                          - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.derivws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
                           - **Original**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}
                       - **App ID**: `${{ steps.generate_app_id.outputs.app_id }}`
 
@@ -55,14 +55,14 @@ jobs:
                         ```
                         - **PR**: [${{ steps.generate_app_id.outputs.pr_url }}](${{ steps.generate_app_id.outputs.pr_url }})
                         - **URLs**:
-                            - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
+                            - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.derivws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
                             - **Original**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}
                         - **App ID**: `${{ steps.generate_app_id.outputs.app_id }}`
                         ```
                       </details>
 
             - name: Store generated URL in artifact
-              run: echo "HOME_URL=${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}" >> ${{ github.workspace }}/url.txt
+              run: echo "HOME_URL=${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.derivws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}" >> ${{ github.workspace }}/url.txt
             - name: Upload artifact
               uses: actions/upload-artifact@master
               with:

diff --git a/packages/bot-skeleton/README.md b/packages/bot-skeleton/README.md
@@ -67,7 +67,7 @@ bot bot-example.js
 **Use only if you know what you're doing**
 
 ```
-ENDPOINT='wss://ws.binaryws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
+ENDPOINT='wss://ws.derivws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
 ```
 
 ### CLI examples

diff --git a/packages/bot-web-ui/README.md b/packages/bot-web-ui/README.md
@@ -67,7 +67,7 @@ bot bot-example.js
 **Use only if you know what you're doing**
 
 ```
-ENDPOINT='wss://ws.binaryws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
+ENDPOINT='wss://ws.derivws.com/websockets/v3?l=en&app_id=1169' bot bot-example.js
 ```
 
 ### CLI examples:

diff --git a/packages/core/src/App/Devtools.tsx b/packages/core/src/App/Devtools.tsx
@@ -46,7 +46,7 @@ const EndpointSection = observer(() => {
                 maxLength={30}
                 error={formik.touched.server ? formik.errors.server : undefined}
                 label='Server'
-                hint='e.g. frontend.binaryws.com'
+                hint='e.g. frontend.derivws.com'
                 {...formik.getFieldProps('server')}
             />
             <Input

diff --git a/packages/core/src/Modules/Endpoint/Endpoint.jsx b/packages/core/src/Modules/Endpoint/Endpoint.jsx
@@ -113,7 +113,7 @@ const Endpoint = () => {
                         </Text>
                     </div>
 
-                    <InputField name='server' label='Server' hint='e.g. frontend.binaryws.com' />
+                    <InputField name='server' label='Server' hint='e.g. frontend.derivws.com' />
                     <InputField
                         name='app_id'
                         label='OAuth App ID'

diff --git a/packages/shared/src/utils/config/config.ts b/packages/shared/src/utils/config/config.ts
@@ -94,7 +94,7 @@ export const getSocketURL = () => {
     const is_real = loginid && !/^(VRT|VRW)/.test(loginid);
 
     const server = is_real ? 'green' : 'blue';
-    const server_url = `${server}.binaryws.com`;
+    const server_url = `${server}.derivws.com`;
 
     return server_url;
 };
@@ -110,7 +110,7 @@ export const checkAndSetEndpointFromUrl = () => {
             url_params.delete('qa_server');
             url_params.delete('app_id');
 
-            if (/^(^(www\.)?qa[0-9]{1,4}\.deriv.dev|(.*)\.binaryws\.com)$/.test(qa_server) && /^[0-9]+$/.test(app_id)) {
+            if (/^(^(www\.)?qa[0-9]{1,4}\.deriv.dev|(.*)\.derivws\.com)$/.test(qa_server) && /^[0-9]+$/.test(app_id)) {
                 localStorage.setItem('config.app_id', app_id);
                 localStorage.setItem('config.server_url', qa_server);
             }

diff --git a/packages/wallets/src/features/cashier/modules/DepositCrypto/DepositCrypto.scss b/packages/wallets/src/features/cashier/modules/DepositCrypto/DepositCrypto.scss
@@ -1,12 +1,15 @@
 .wallets-deposit-crypto {
     display: flex;
     flex-direction: column;
+    padding-top: 2.4rem;
     justify-content: center;
     gap: 2.4rem;
     position: relative;
 
     @include mobile {
         width: 100%;
         justify-content: start;
+        padding-top: 0rem;
+        gap: 1.6rem;
     }
 }
diff --git a/...es/cashier/modules/DepositCrypto/components/DepositCryptoAddress/DepositCryptoAddress.tsx b/...es/cashier/modules/DepositCrypto/components/DepositCryptoAddress/DepositCryptoAddress.tsx
@@ -26,7 +26,7 @@ const DepositCryptoAddress = () => {
 
     return (
         <div className='wallets-deposit-crypto-address'>
-            <QRCode size={isMobile ? 128 : 160} value={depositCryptoAddress || ''} />
+            <QRCode size={128} value={depositCryptoAddress || ''} />
             <div className='wallets-deposit-crypto-address__hash-container'>
                 <p className='wallets-deposit-crypto-address__hash'>{depositCryptoAddress}</p>
                 <WalletClipboard

diff --git a/...s/DepositCrypto/components/DepositCryptoCurrencyDetails/DepositCryptoCurrencyDetails.scss b/...s/DepositCrypto/components/DepositCryptoCurrencyDetails/DepositCryptoCurrencyDetails.scss
diff --git a/...es/DepositCrypto/components/DepositCryptoCurrencyDetails/DepositCryptoCurrencyDetails.tsx b/...es/DepositCrypto/components/DepositCryptoCurrencyDetails/DepositCryptoCurrencyDetails.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
 import { useActiveWalletAccount } from '@deriv/api';
-import './DepositCryptoCurrencyDetails.scss';
+import { WalletText } from '../../../../../../components';
 
 const DepositCryptoCurrencyDetails = () => {
     const { data } = useActiveWalletAccount();
 
     return (
-        <p className='wallets-deposit-crypto-currency-details'>
+        <WalletText align='center' size='md' weight='bold'>
             Send only {data?.currency_config?.name} ({data?.currency_config?.display_code}) to this address.
-        </p>
+        </WalletText>
     );
 };
 

diff --git a/...r/modules/DepositCrypto/components/DepositCryptoDisclaimers/DepositCryptoDisclaimers.scss b/...r/modules/DepositCrypto/components/DepositCryptoDisclaimers/DepositCryptoDisclaimers.scss
@@ -4,14 +4,19 @@
     justify-content: center;
     gap: 2.4rem;
 
+    @include mobile {
+        gap: 1.6rem;
+    }
+
     &__content {
         line-height: 1.4rem;
     }
 
     &__note {
-        display: flex;
-        justify-content: center;
         font-size: 1.2rem;
         line-height: 1.8rem;
+        text-align: center;
+        display: flex;
+        justify-content: center;
     }
 }
diff --git a/...er/modules/DepositCrypto/components/DepositCryptoDisclaimers/DepositCryptoDisclaimers.tsx b/...er/modules/DepositCrypto/components/DepositCryptoDisclaimers/DepositCryptoDisclaimers.tsx
@@ -22,7 +22,9 @@ const DepositCryptoDisclaimers = () => {
         <div className='wallets-deposit-crypto-disclaimers'>
             <InlineMessage>
                 <div className='wallets-deposit-crypto-disclaimers__content'>
-                    <p>To avoid loss of funds:</p>
+                    <WalletText size='2xs' weight='bold'>
+                        To avoid loss of funds:
+                    </WalletText>
                     <br />
                     {data?.currency_config?.minimum_deposit && (
                         <li>