Skip to content

Commit 324f556

Browse files
sandeep-derivsandeep-deriv
authored
Merge branch 'master' into ahmed/DAPI-790/fix--markup-error-message
2 parents 5f501ac + eae2f2f commit 324f556

File tree

26 files changed

+328
-244
lines changed

26 files changed

+328
-244
lines changed

‎config/v3/get_settings/receive.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,6 @@
200200
"verified"
201201
],
202202
"properties": {
203-
"carriers": {
204-
"description": "A list of available carriers (if empty assume Phone Number Verification is not available at the moment)",
205-
"type": "array"
206-
},
207203
"challenge_attempts_remaining": {
208204
"description": "Indicates the attempts remaining for /phone_number_challenge",
209205
"type": "integer"

‎config/v3/landing_company/receive.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,10 @@
971971
"financial_stp": {
972972
"$ref": "#/$defs/landingCompanyDetails",
973973
"description": "Contain details for landing company for Financial STP subtype. The Financial STP account provides you with tight spreads, higher ticket size and offers a variety of FX pairs from majors to exotics. It is a straight through processing (STP) account with direct access to FX liquidity from various providers."
974+
},
975+
"gold": {
976+
"$ref": "#/$defs/landingCompanyDetails",
977+
"description": "Contain details for landing company for gold sub account type."
974978
}
975979
}
976980
},

‎config/v3/mt5_get_settings/receive.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@
178178
"swap_free",
179179
"ibt",
180180
"stp",
181-
"zero_spread"
181+
"zero_spread",
182+
"gold"
182183
]
183184
},
184185
"zipCode": {

‎config/v3/mt5_login_list/receive.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@
255255
"swap_free",
256256
"zero_spread",
257257
"standard",
258-
"stp"
258+
"stp",
259+
"gold"
259260
]
260261
},
261262
"request_timestamp": {
@@ -418,7 +419,8 @@
418419
"hr",
419420
"ab",
420421
"ba",
421-
"stp"
422+
"stp",
423+
"gold"
422424
]
423425
},
424426
"sub_account_type": {
@@ -431,7 +433,8 @@
431433
"swap_free",
432434
"ibt",
433435
"stp",
434-
"zero_spread"
436+
"zero_spread",
437+
"gold"
435438
]
436439
},
437440
"webtrader_url": {

‎config/v3/mt5_new_account/receive.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
"type": "string",
5454
"enum": [
5555
"conventional",
56-
"swap_free"
56+
"swap_free",
57+
"gold"
5758
]
5859
},
5960
"mt5_account_type": {
@@ -62,7 +63,8 @@
6263
"enum": [
6364
"financial",
6465
"financial_stp",
65-
"standard"
66+
"standard",
67+
"gold"
6668
]
6769
},
6870
"product": {
@@ -75,7 +77,8 @@
7577
"swap_free",
7678
"zero_spread",
7779
"standard",
78-
"stp"
80+
"stp",
81+
"gold"
7982
]
8083
},
8184
"sub_account_type": {
@@ -86,7 +89,8 @@
8689
"stp",
8790
"ibt",
8891
"swap_free",
89-
"zero_spread"
92+
"zero_spread",
93+
"gold"
9094
]
9195
}
9296
}

‎config/v3/mt5_new_account/send.json‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,17 @@
9999
"type": "string",
100100
"enum": [
101101
"conventional",
102-
"swap_free"
102+
"swap_free",
103+
"gold"
103104
]
104105
},
105106
"mt5_account_type": {
106107
"description": "[Optional] Financial: Variable spreads, High leverage. Financial STP: Variable spreads, Medium Leverage, more products. If 'account_type' set to 'financial', setting 'mt5_account_type' is also required.",
107108
"type": "string",
108109
"enum": [
109110
"financial",
110-
"financial_stp"
111+
"financial_stp",
112+
"gold"
111113
]
112114
},
113115
"name": {
@@ -140,7 +142,8 @@
140142
"swap_free",
141143
"zero_spread",
142144
"standard",
143-
"stp"
145+
"stp",
146+
"gold"
144147
]
145148
},
146149
"server": {
@@ -173,7 +176,8 @@
173176
"ab",
174177
"ba",
175178
"lim",
176-
"hr"
179+
"hr",
180+
"gold"
177181
]
178182
},
179183
"sub_account_type": {
@@ -184,7 +188,8 @@
184188
"stp",
185189
"ibt",
186190
"swap_free",
187-
"zero_spread"
191+
"zero_spread",
192+
"gold"
188193
]
189194
},
190195
"zipCode": {

‎config/v3/p2p_settings/receive.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
"order_expiry_options",
3535
"order_payment_period",
3636
"payment_methods_enabled",
37+
"pnv_required",
38+
"poa_required",
3739
"review_period",
3840
"supported_currencies"
3941
],
@@ -196,6 +198,14 @@
196198
1
197199
]
198200
},
201+
"is_floating_rate_ad_supported": {
202+
"description": "Indicates that floating rate adverts are available for this currency.",
203+
"type": "integer",
204+
"enum": [
205+
0,
206+
1
207+
]
208+
},
199209
"symbol": {
200210
"description": "Local currency symbol",
201211
"type": "string"
@@ -239,6 +249,22 @@
239249
1
240250
]
241251
},
252+
"pnv_required": {
253+
"description": "Indicates if phone number verification is required to become a P2P advertiser.",
254+
"type": "integer",
255+
"enum": [
256+
0,
257+
1
258+
]
259+
},
260+
"poa_required": {
261+
"description": "Indicates if proof of address is required to become a P2P advertiser.",
262+
"type": "integer",
263+
"enum": [
264+
0,
265+
1
266+
]
267+
},
242268
"review_period": {
243269
"description": "Time after successful order completion during which reviews can be created, in hours.",
244270
"type": "number"

‎config/v3/transfer_between_accounts/receive.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@
105105
"swap_free",
106106
"zero_spread",
107107
"standard",
108-
"stp"
108+
"stp",
109+
"gold"
109110
]
110111
},
111112
"status": {
@@ -126,7 +127,8 @@
126127
"financial_stp",
127128
"standard",
128129
"swap_free",
129-
"zero_spread"
130+
"zero_spread",
131+
"gold"
130132
]
131133
},
132134
"transfers": {

‎i18n/en/code.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,5 +1112,8 @@
11121112
},
11131113
"Markup value is required and must be between 0.00 and 3.00.": {
11141114
"message": "Markup value is required and must be between 0.00 and 3.00."
1115+
},
1116+
"Clear response": {
1117+
"message": "Clear response"
11151118
}
11161119
}

‎i18n/fr/code.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@
711711
"If your app includes verification logic, enter the email verification URL below (e.g. for account opening, verification, and password reset):": {
712712
"message": "Si votre application inclut une logique de vérification, entrez l'URL de vérification par e-mail ci-dessous (par exemple pour l'ouverture de compte, la vérification et la réinitialisation de mot de passe) :"
713713
},
714-
"If provided, the verification URL will be appended with a token and sent to the user's email. Otherwise, the Redirect URL with the token will be used.": {
714+
"If provided, the verification URL will be appended with a token and sent to the user's email. Otherwise, the redirect URL with the token will be used.": {
715715
"message": "Si fourni, l'URL de vérification sera complétée par un Token et envoyée à l'email de l'utilisateur. Sinon, l'URL de redirection avec le Token sera utilisée."
716716
},
717717
"Scopes of authorisation": {
@@ -1112,5 +1112,8 @@
11121112
},
11131113
"Markup value is required and must be between 0.00 and 3.00.": {
11141114
"message": "La valeur de la majoration est requise et doit être comprise entre 0,00 et 3,00."
1115+
},
1116+
"Clear response": {
1117+
"message": "Effacer la réponse"
11151118
}
11161119
}

0 commit comments

Comments
 (0)