Skip to content

Commit 8238282

Browse files
chrisgodfrey-derivchrisgodfrey-deriv
authored
Merge branch 'binary-com:master' into master
2 parents 20b1904 + 1b700ff commit 8238282

36 files changed

+5038
-5717
lines changed

‎.well-known/apple-app-site-association

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{
2+
"appclips": {
3+
"apps": []
4+
},
5+
"applinks": {
6+
"details": [
7+
{
8+
"appID": "36S5Q8S4V5.com.deriv.app",
9+
"paths": [
10+
"/redirect/derivgo"
11+
]
12+
},
13+
{
14+
"appID": "36S5Q8S4V5.com.deriv.app.dev",
15+
"paths": [
16+
"/redirect/derivgo"
17+
]
18+
},
19+
{
20+
"appID": "36S5Q8S4V5.com.deriv.app.staging",
21+
"paths": [
22+
"/redirect/derivgo"
23+
]
24+
},
25+
{
26+
"appID": "36S5Q8S4V5.com.deriv.dp2p",
27+
"paths": [
28+
"/cashier/p2p",
29+
"/cashier/p2p/advertiser",
30+
"/redirect/p2p"
31+
]
32+
},
33+
{
34+
"appID": "36S5Q8S4V5.com.deriv.sample",
35+
"paths": [
36+
"/redirect"
37+
]
38+
},
39+
{
40+
"appID": "36S5Q8S4V5.com.deriv.blanc",
41+
"paths": [
42+
"/redirect"
43+
]
44+
},
45+
{
46+
"appID": "36S5Q8S4V5.com.deriv.blanc.dev",
47+
"paths": [
48+
"/redirect"
49+
]
50+
},
51+
{
52+
"appID": "36S5Q8S4V5.com.deriv.blanc.stg",
53+
"paths": [
54+
"/redirect"
55+
]
56+
}
57+
]
58+
},
59+
"webcredentials": {
60+
"apps": [
61+
"36S5Q8S4V5.com.deriv.app",
62+
"36S5Q8S4V5.com.deriv.app.dev",
63+
"36S5Q8S4V5.com.deriv.app.staging",
64+
"36S5Q8S4V5.com.deriv.dp2p",
65+
"36S5Q8S4V5.com.deriv.blanc",
66+
"36S5Q8S4V5.com.deriv.blanc.dev",
67+
"36S5Q8S4V5.com.deriv.blanc.stg",
68+
"36S5Q8S4V5.com.deriv.sample"
69+
]
70+
}
71+
}

‎crowdin/messages.json

+3-49
Large diffs are not rendered by default.

‎package-lock.json

-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/copy-htaccess.js

+37-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,54 @@
11
const fs = require('fs');
22
const path = require('path');
33

4-
const region = process.argv[2]
4+
const region = process.argv[2];
55

6-
function generatePublicPath(region){
7-
return path.join(__dirname, '..', "sites", region, 'public', '.htaccess');
6+
function generatePublicPath(region) {
7+
return path.join(__dirname, '..', 'sites', region, 'public');
88
}
99

10-
// Path to your custom .htaccess file in the project root
10+
// Path to your custom .htaccess file and .well-known directory in the project root
1111
const htaccessPath = path.join(__dirname, '..', '.htaccess');
12+
const wellKnownSourcePath = path.join(__dirname, '..', '.well-known');
1213

1314
// Path to the Gatsby public directory
1415
const publicPath = generatePublicPath(region);
16+
const wellKnownDestPath = path.join(publicPath, '.well-known');
1517

16-
fs.copyFile(htaccessPath, publicPath, (err) => {
18+
// Ensure the public directory exists
19+
fs.mkdirSync(publicPath, { recursive: true });
20+
21+
// Function to copy directory recursively
22+
const copyDirectory = (src, dest) => {
23+
const entries = fs.readdirSync(src, { withFileTypes: true });
24+
25+
fs.mkdirSync(dest, { recursive: true });
26+
27+
for (let entry of entries) {
28+
const srcPath = path.join(src, entry.name);
29+
const destPath = path.join(dest, entry.name);
30+
31+
if (entry.isDirectory()) {
32+
copyDirectory(srcPath, destPath);
33+
} else {
34+
fs.copyFileSync(srcPath, destPath);
35+
}
36+
}
37+
};
38+
39+
// Copy .htaccess file
40+
fs.copyFile(htaccessPath, path.join(publicPath, '.htaccess'), (err) => {
1741
if (err) {
1842
console.error('Error copying .htaccess file:', err);
1943
return;
2044
}
2145
console.log('.htaccess file copied successfully.');
2246
});
47+
48+
// Copy .well-known directory
49+
if (fs.existsSync(wellKnownSourcePath)) {
50+
copyDirectory(wellKnownSourcePath, wellKnownDestPath);
51+
console.log('.well-known directory copied successfully.');
52+
} else {
53+
console.error('.well-known directory does not exist.');
54+
}

‎themes/gatsby-theme-deriv/src/features/components/templates/footer/description.tsx

+5-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export const DescriptionContentROW = () => {
5757
export const DescriptionContentEU = () => {
5858
return (
5959
<>
60-
<Text size="sm">
60+
<Text size="sm" className="text-solid-slate-1400">
6161
<Localize
6262
translate_text="_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act._t_"
6363
components={[
@@ -70,7 +70,7 @@ export const DescriptionContentEU = () => {
7070
]}
7171
/>
7272
</Text>
73-
<Text size="sm" className="pt-general-lg">
73+
<Text size="sm" className="pt-general-lg text-solid-slate-1400">
7474
<Localize
7575
translate_text="_t_Make sure to read our <0>Terms and Conditions</0>, <1>Risk Disclosure</1>, and <2>Secure and Responsible Trading</2> to fully understand the risks involved before using our services. Please also note that the information on this website does not constitute investment advice. The value of investments may go down as well as up._t_"
7676
components={[
@@ -147,7 +147,9 @@ export const DescriptionContent = () => {
147147
const { region } = useBuildVariant()
148148
const { is_cpa_plan } = useRegion()
149149
const { exitRef } = useFloatingCtaContext()
150-
const descriptionContent = (region === "row" && <DescriptionContentROW />) || (region === "eu" && <DescriptionContentEU />);
150+
const descriptionContent =
151+
(region === 'row' && <DescriptionContentROW />) ||
152+
(region === 'eu' && <DescriptionContentEU />)
151153
const [content, setContent] = useState(descriptionContent)
152154

153155
useEffect(() => {

‎themes/gatsby-theme-deriv/src/features/pages/signup-v2/form-container/form-social-buttons.tsx

+16-12
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ import React from 'react'
22
import { Analytics } from '@deriv-com/analytics'
33
import {
44
SocialAppleWhiteIcon,
5+
SocialAppleBlackIcon,
56
SocialFacebookBrandIcon,
67
SocialGoogleBrandIcon,
78
} from '@deriv/quill-icons'
89
import { Button } from '@deriv/quill-design'
9-
import { signup_apple_btn, signup_fb_btn, signup_login_redirect } from '../signup.module.scss'
10+
import { signup_login_redirect } from '../signup.module.scss'
1011
import Login from 'common/login'
1112
import Typography from 'features/components/atoms/typography'
1213
import { Localize } from 'components/localization'
1314
import { isBrowser } from 'common/utility'
1415
import useThirdPartyFlags from 'components/hooks/use-third-party-flags'
1516

16-
const FormSocialButtons = () => {
17+
const FormSocialButtons = ({ theme }: { theme: 'dark' | 'plain' }) => {
1718
const analyticsData: Parameters<typeof Analytics.trackEvent>[1] = {
1819
action: 'started',
1920
form_source: isBrowser() && window.location.hostname,
@@ -23,25 +24,28 @@ const FormSocialButtons = () => {
2324
const facebook_signup = useThirdPartyFlags('facebook_signup')
2425
const apple_signup = useThirdPartyFlags('apple_signup')
2526

27+
const textStyleOverrides = theme === 'dark' ? ({ textcolor: 'white' } as const) : {}
28+
const buttonStyleOverrides =
29+
theme === 'dark' ? ({ colorStyle: 'white' } as const) : ({ colorStyle: 'black' } as const)
30+
2631
return (
2732
<>
2833
{google_signup && (
2934
<Button
3035
size="lg"
3136
variant="secondary"
32-
colorStyle="white"
3337
icon={SocialGoogleBrandIcon}
3438
fullWidth={true}
3539
iconPosition="start"
3640
id="dm-signup-google"
37-
// className={signup_fb_btn}
3841
onClick={() => {
3942
Analytics?.trackEvent('ce_virtual_signup_form', {
4043
signup_provider: 'google',
4144
...analyticsData,
4245
})
4346
Login.initOneAll('google')
4447
}}
48+
{...buttonStyleOverrides}
4549
>
4650
<Localize translate_text={'_t_Google_t_'} />
4751
</Button>
@@ -50,11 +54,10 @@ const FormSocialButtons = () => {
5054
<Button
5155
size="lg"
5256
variant="secondary"
53-
colorStyle="white"
5457
icon={SocialFacebookBrandIcon}
5558
fullWidth={true}
5659
iconPosition="start"
57-
className={signup_fb_btn}
60+
// className={signup_fb_btn}
5861
id="dm-signup-facebook"
5962
onClick={() => {
6063
Analytics?.trackEvent('ce_virtual_signup_form', {
@@ -63,6 +66,7 @@ const FormSocialButtons = () => {
6366
})
6467
Login.initOneAll('facebook')
6568
}}
69+
{...buttonStyleOverrides}
6670
>
6771
<Localize translate_text={'_t_Facebook_t_'} />
6872
</Button>
@@ -71,11 +75,10 @@ const FormSocialButtons = () => {
7175
<Button
7276
size="lg"
7377
variant="secondary"
74-
colorStyle="white"
75-
icon={SocialAppleWhiteIcon}
78+
icon={theme === 'dark' ? SocialAppleWhiteIcon : SocialAppleBlackIcon}
7679
fullWidth={true}
7780
iconPosition="start"
78-
className={signup_apple_btn}
81+
// className={signup_apple_btn}
7982
id="dm-signup-apple"
8083
onClick={() => {
8184
Analytics?.trackEvent('ce_virtual_signup_form', {
@@ -84,19 +87,19 @@ const FormSocialButtons = () => {
8487
})
8588
Login.initOneAll('apple')
8689
}}
90+
{...buttonStyleOverrides}
8791
>
8892
<Localize translate_text={'_t_Apple_t_'} />
8993
</Button>
9094
)}
91-
<Typography.Paragraph mt="2x" textcolor="white" align="center">
95+
<Typography.Paragraph mt="2x" align="center" {...textStyleOverrides}>
9296
<Localize
9397
translate_text="_t_Already have an account? <0>Log in</0>_t_"
9498
components={[
9599
<Typography.Paragraph
96100
as="span"
97-
textcolor="white"
98101
key={0}
99-
weight='bold'
102+
weight="bold"
100103
className={signup_login_redirect}
101104
onClick={(event) => {
102105
event.preventDefault()
@@ -107,6 +110,7 @@ const FormSocialButtons = () => {
107110
})
108111
Login.redirectToLogin()
109112
}}
113+
{...textStyleOverrides}
110114
/>,
111115
]}
112116
/>

‎themes/gatsby-theme-deriv/src/features/pages/signup-v2/form-container/index.tsx

+15-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,16 @@ import Flex from 'features/components/atoms/flex-box'
77
import Typography from 'features/components/atoms/typography'
88
import { Localize } from 'components/localization'
99

10-
const SignUpFormContainer = ({ onModalClose }: { onModalClose: () => void }) => {
10+
const SignUpFormContainer = ({
11+
onModalClose,
12+
theme,
13+
}: {
14+
onModalClose: () => void
15+
theme: 'plain' | 'dark'
16+
}) => {
17+
const textStyleOverrides = theme === 'dark' ? ({ textcolor: 'white' } as const) : {}
18+
const logoStyleOverrides = theme === 'dark' ? ({ fill: 'white' } as const) : {}
19+
1120
return (
1221
<Flex.Box
1322
basis="full"
@@ -24,22 +33,22 @@ const SignUpFormContainer = ({ onModalClose }: { onModalClose: () => void }) =>
2433
className={signup_form_container}
2534
>
2635
<Flex.Box justify="between" pr="5x" align="center">
27-
<Typography.Heading size="xxl" textcolor="white" className={sign_up_header}>
36+
<Typography.Heading size="xxl" className={sign_up_header} {...textStyleOverrides}>
2837
<Localize translate_text="_t_Sign Up_t_" />
2938
</Typography.Heading>
30-
<LabelPairedXmarkLgBoldIcon onClick={onModalClose} fill="white" />
39+
<LabelPairedXmarkLgBoldIcon onClick={onModalClose} {...logoStyleOverrides} />
3140
</Flex.Box>
3241

3342
<Flex.Box className={signup_form_layout} direction="col" pb="6x" gap="8x">
34-
<SignUpPageForm />
43+
<SignUpPageForm theme={theme} />
3544
<Flex.Box justify="center" align="center">
3645
<Flex.Item grow="1">
37-
<Typography.Paragraph align="center" textcolor="white">
46+
<Typography.Paragraph align="center" {...textStyleOverrides}>
3847
<Localize translate_text="_t_Or sign up with_t_" />
3948
</Typography.Paragraph>
4049
</Flex.Item>
4150
</Flex.Box>
42-
<FormSocialButtons />
51+
<FormSocialButtons theme={theme} />
4352
</Flex.Box>
4453
</Flex.Box>
4554
)

0 commit comments

Comments
 (0)