Skip to content

Commit 38b5545

Browse files
ahmed-derivahmed-deriv
authored
Merge branch 'master' into ahmed/DAPI-853/feat--add-business-partner-terms
2 parents a8cef99 + f981ef4 commit 38b5545

File tree

12 files changed

+226
-39
lines changed

12 files changed

+226
-39
lines changed

‎config/v3/buy/send.json

+37-26
Original file line numberDiff line numberDiff line change
@@ -73,44 +73,46 @@
7373
"description": "A valid contract-type",
7474
"type": "string",
7575
"enum": [
76-
"MULTUP",
77-
"MULTDOWN",
78-
"UPORDOWN",
79-
"EXPIRYRANGE",
80-
"ONETOUCH",
81-
"CALLE",
82-
"LBHIGHLOW",
76+
"ACCU",
8377
"ASIAND",
84-
"EXPIRYRANGEE",
78+
"ASIANU",
79+
"CALL",
80+
"CALLE",
81+
"CALLSPREAD",
8582
"DIGITDIFF",
83+
"DIGITEVEN",
8684
"DIGITMATCH",
85+
"DIGITODD",
8786
"DIGITOVER",
88-
"PUTE",
8987
"DIGITUNDER",
90-
"NOTOUCH",
91-
"CALL",
92-
"RANGE",
88+
"EXPIRYMISS",
89+
"EXPIRYMISSE",
90+
"EXPIRYRANGE",
91+
"EXPIRYRANGEE",
92+
"LBFLOATCALL",
9393
"LBFLOATPUT",
94-
"DIGITODD",
94+
"LBHIGHLOW",
95+
"MULTDOWN",
96+
"MULTUP",
97+
"NOTOUCH",
98+
"ONETOUCH",
9599
"PUT",
96-
"ASIANU",
97-
"LBFLOATCALL",
98-
"EXPIRYMISSE",
99-
"EXPIRYMISS",
100-
"DIGITEVEN",
101-
"TICKHIGH",
102-
"TICKLOW",
100+
"PUTE",
101+
"PUTSPREAD",
102+
"RANGE",
103103
"RESETCALL",
104104
"RESETPUT",
105-
"CALLSPREAD",
106-
"PUTSPREAD",
107105
"RUNHIGH",
108106
"RUNLOW",
109-
"ACCU",
110-
"VANILLALONGCALL",
111-
"VANILLALONGPUT",
107+
"SNOWDOWN",
108+
"SNOWUP",
109+
"TICKHIGH",
110+
"TICKLOW",
112111
"TURBOSLONG",
113-
"TURBOSSHORT"
112+
"TURBOSSHORT",
113+
"UPORDOWN",
114+
"VANILLALONGCALL",
115+
"VANILLALONGPUT"
114116
]
115117
},
116118
"currency": {
@@ -192,6 +194,15 @@
192194
"type": "string",
193195
"pattern": "^\\w{2,30}$"
194196
},
197+
"trade_risk_profile": {
198+
"description": "[For Snowball only] The trade risk profile for Snowball trade types.",
199+
"type": "string",
200+
"enum": [
201+
"low",
202+
"medium",
203+
"high"
204+
]
205+
},
195206
"trading_period_start": {
196207
"description": "[Optional] An epoch value of a predefined trading period start time",
197208
"type": "integer",

‎config/v3/contracts_for/receive.json

+26
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,19 @@
124124
2
125125
]
126126
},
127+
"duration_choices": {
128+
"description": "[Only for Snowball] Available contract durations in seconds.",
129+
"type": "array",
130+
"items": {
131+
"type": "integer",
132+
"examples": [
133+
300,
134+
600,
135+
1200
136+
]
137+
},
138+
"minItems": 1
139+
},
127140
"exchange_name": {
128141
"description": "Name of exchange",
129142
"type": "string",
@@ -271,6 +284,19 @@
271284
"random_index"
272285
]
273286
},
287+
"trade_risk_profile_choices": {
288+
"description": "[Only for Snowball] Available risk profile options.",
289+
"type": "array",
290+
"items": {
291+
"type": "string",
292+
"examples": [
293+
"low",
294+
"medium",
295+
"high"
296+
]
297+
},
298+
"minItems": 1
299+
},
274300
"trading_period": {
275301
"description": "A hash of predefined trading period",
276302
"type": "object"

‎config/v3/new_account_virtual/receive.json

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
"description": "Email of the new virtual-money account",
4242
"type": "string"
4343
},
44+
"login_code": {
45+
"description": "[Optional] One-time code for passwordless login, valid for 1 minute",
46+
"type": "string"
47+
},
4448
"oauth_token": {
4549
"description": "Oauth token for the client's login session (so that the user may be logged in immediately)",
4650
"type": "string"

‎config/v3/new_partner_account/example.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"last_name": "Pan",
1212
"partner_type": "individual",
1313
"phone": "+10023456789",
14-
"provider": "dynamicworks",
14+
"provider": "myaffiliate",
1515
"residence": "au",
1616
"salutation": "Mr",
1717
"secret_answer": "Jones",

‎config/v3/proposal/receive.json

+40
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,22 @@
8686
2.123
8787
]
8888
},
89+
"caution_price": {
90+
"description": "The caution price for the Snowball contract. Breaching this price will reset the coupons accrued to 0.",
91+
"type": "string",
92+
"pattern": "^[+-]?[0-9]+\\.?[0-9]*$",
93+
"examples": [
94+
"10001.2"
95+
]
96+
},
97+
"coupon_rate": {
98+
"description": "The coupon rate for the Snowball contract at which the stake will grow for each coupon accrued.",
99+
"type": "string",
100+
"pattern": "^[+-]?[0-9]+\\.?[0-9]*$",
101+
"examples": [
102+
"0.0132"
103+
]
104+
},
89105
"high_barrier": {
90106
"description": "High barrier calculated based on current spot",
91107
"type": "string",
@@ -134,6 +150,21 @@
134150
"1.00"
135151
]
136152
},
153+
"num_of_coupons": {
154+
"description": "The maximum number of coupons available for the Snowball contract.",
155+
"type": "integer",
156+
"examples": [
157+
5
158+
]
159+
},
160+
"profit_price": {
161+
"description": "The profit price for the Snowball contract. Breaching this price will close the contract immediately.",
162+
"type": "string",
163+
"pattern": "^[+-]?[0-9]+\\.?[0-9]*$",
164+
"examples": [
165+
"10005.2"
166+
]
167+
},
137168
"tick_size_barrier": {
138169
"description": "Tick size barrier for Accumulator contracts",
139170
"type": "number",
@@ -157,6 +188,15 @@
157188
50
158189
]
159190
}
191+
},
192+
"trade_risk_profile": {
193+
"description": "The trade risk profile for the Snowball contract.",
194+
"type": "string",
195+
"enum": [
196+
"low",
197+
"medium",
198+
"high"
199+
]
160200
}
161201
}
162202
},

‎config/v3/proposal/send.json

+11
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
"TICKLOW",
9090
"RESETCALL",
9191
"RESETPUT",
92+
"SNOWDOWN",
93+
"SNOWUP",
9294
"CALLSPREAD",
9395
"PUTSPREAD",
9496
"RUNHIGH",
@@ -187,6 +189,15 @@
187189
"type": "string",
188190
"pattern": "^\\w{2,30}$"
189191
},
192+
"trade_risk_profile": {
193+
"description": "[Only for Snowball] The trade risk profile for the Snowball contract. Higher risk profile offers higher coupon rate at the expense of higher probability of breaching caution price",
194+
"type": "string",
195+
"enum": [
196+
"low",
197+
"medium",
198+
"high"
199+
]
200+
},
190201
"trading_period_start": {
191202
"description": "[Optional] Required only for multi-barrier trading. Defines the epoch value of the trading period start time.",
192203
"type": "integer"

‎config/v3/proposal_open_contract/receive.json

+47
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,14 @@
211211
}
212212
}
213213
},
214+
"caution_price": {
215+
"description": "The caution price for the Snowball contract. Breaching this price will reset the coupons accrued to 0.",
216+
"type": "string",
217+
"pattern": "^[+-]?[0-9]+\\.?[0-9]*$",
218+
"examples": [
219+
"10001.2"
220+
]
221+
},
214222
"commision": {
215223
"description": "Commission in payout currency amount.",
216224
"type": [
@@ -237,6 +245,21 @@
237245
"PUT"
238246
]
239247
},
248+
"coupon_collection_epochs": {
249+
"description": "The epoch times at which the coupons will be accrued for the Snowball contract.",
250+
"type": "array",
251+
"items": {
252+
"type": "integer"
253+
}
254+
},
255+
"coupon_rate": {
256+
"description": "The coupon rate for the Snowball contract at which the stake will grow for each coupon accrued.",
257+
"type": "string",
258+
"pattern": "^[+-]?[0-9]+\\.?[0-9]*$",
259+
"examples": [
260+
"0.0132"
261+
]
262+
},
240263
"currency": {
241264
"description": "The currency code of the contract.",
242265
"type": "string",
@@ -631,6 +654,13 @@
631654
"description": "[Only for lookback trades] Multiplier applies when calculating the final payoff for each type of lookback. e.g. (Exit spot - Lowest historical price) * multiplier = Payout",
632655
"type": "number"
633656
},
657+
"num_of_coupons": {
658+
"description": "The maximum number of coupons available for the Snowball contract.",
659+
"type": "integer",
660+
"examples": [
661+
5
662+
]
663+
},
634664
"payout": {
635665
"description": "Payout value of the contract.",
636666
"type": "number",
@@ -646,6 +676,14 @@
646676
"description": "Profit in percentage.",
647677
"type": "number"
648678
},
679+
"profit_price": {
680+
"description": "The profit price for the Snowball contract. Breaching this price will close the contract immediately.",
681+
"type": "string",
682+
"pattern": "^[+-]?[0-9]+\\.?[0-9]*$",
683+
"examples": [
684+
"10005.2"
685+
]
686+
},
649687
"purchase_time": {
650688
"description": "Epoch of purchase time, will be same as `date_start` for all contracts except forward starting contracts.",
651689
"type": "integer"
@@ -775,6 +813,15 @@
775813
}
776814
}
777815
},
816+
"trade_risk_profile": {
817+
"description": "The trade risk profile for the Snowball contract.",
818+
"type": "string",
819+
"enum": [
820+
"low",
821+
"medium",
822+
"high"
823+
]
824+
},
778825
"transaction_ids": {
779826
"title": "Transaction ids for contract",
780827
"description": "Every contract has buy and sell transaction ids, i.e. when you purchase a contract we associate it with buy transaction id, and if contract is already sold we associate that with sell transaction id.",

‎config/v3/transfer_between_accounts/receive.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
"paymentagent",
4747
"paymentagent_client",
4848
"standard",
49-
"virtual"
49+
"virtual",
50+
"partner"
5051
]
5152
},
5253
"balance": {

‎i18n/en/code.json

+3
Original file line numberDiff line numberDiff line change
@@ -1121,5 +1121,8 @@
11211121
},
11221122
"and General Business Partners": {
11231123
"message": "and General Business Partners"
1124+
},
1125+
"Copied": {
1126+
"message": "Copied"
11241127
}
11251128
}

‎i18n/fr/code.json

+3
Original file line numberDiff line numberDiff line change
@@ -1121,5 +1121,8 @@
11211121
},
11221122
"and General Business Partners": {
11231123
"message": "et partenaires commerciaux généraux"
1124+
},
1125+
"Copied": {
1126+
"message": "Copié"
11241127
}
11251128
}

‎src/features/dashboard/components/common-table/cell-copy-text.module.scss

+34
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,38 @@
1414
.copyTextIcon {
1515
margin-left: 8px;
1616
margin-top: 4px;
17+
position: relative;
18+
}
19+
20+
.tooltip {
21+
position: absolute;
22+
background-color: rgba(0, 0, 0, 0.75);
23+
color: white;
24+
padding: 5px 10px;
25+
border-radius: 4px;
26+
top: 100%;
27+
left: 50%;
28+
transform: translateX(-50%);
29+
z-index: 1000;
30+
white-space: nowrap;
31+
font-size: 12px;
32+
transition: opacity 0.3s ease, visibility 0.3s ease;
33+
opacity: 0;
34+
visibility: hidden;
35+
36+
&::after {
37+
content: '';
38+
position: absolute;
39+
top: -6px;
40+
left: 50%;
41+
transform: translateX(-50%);
42+
border-width: 0 6px 6px;
43+
border-style: solid;
44+
border-color: transparent transparent rgba(0, 0, 0, 0.75);
45+
}
46+
}
47+
48+
.tooltip.visible {
49+
opacity: 1;
50+
visibility: visible;
1751
}

0 commit comments

Comments
 (0)