Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ahmed/dapi 683/feat filter dropdown app manager desktop #117

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
6a84d7c
Fix HTML SCSS layout issues and update CTA button on responsive
ahmed-deriv Aug 7, 2024
73cc7b1
chore: breadcrumbs
agrim-deriv Aug 8, 2024
12ec98d
fix: resolve comments
agrim-deriv Aug 8, 2024
fdd6271
extra divs
agrim-deriv Aug 8, 2024
02f0795
ahmed/DAPI-618/feat--update-navigation-bar
ahmed-deriv Aug 14, 2024
31a1c7c
Merge branch 'feature/new-dashboard' into ahmed/DAPI-618/feat--update…
ahmed-deriv Aug 14, 2024
a3df4a1
SignedInButton css issue fixed
ahmed-deriv Aug 14, 2024
cdabc41
Remove debugging log command
ahmed-deriv Aug 15, 2024
a047da9
ahmed/DAPI-683/feat--filter-dropdown-app-manager-desktop
ahmed-deriv Aug 16, 2024
7a38180
Code review changes
ahmed-deriv Aug 16, 2024
eadb30d
Replace useCallback with useMemo for props handling
ahmed-deriv Aug 16, 2024
374b624
Merge branch 'feature/new-dashboard' into ahmed/DAPI-626/chore--add-r…
ahmed-deriv Aug 16, 2024
b2eb672
resolve code conflict in api token table component
ahmed-deriv Aug 16, 2024
3b1ee77
chore: removed unused component and updated package lock
sandeep-deriv Aug 19, 2024
ea8f88e
Update props variable names for sub components
ahmed-deriv Aug 19, 2024
9672644
chore: updated scripts and readme
sandeep-deriv Aug 19, 2024
e4601c8
resolve package json conflict
ahmed-deriv Aug 19, 2024
38e42d2
Update package-lock.json
ahmed-deriv Aug 19, 2024
3667efa
ahmed/DAPI-692/fix--text-changes-api-deriv-docs
ahmed-deriv Aug 19, 2024
e9c714d
Merge pull request #98 from deriv-com/sandeep/chore--update-scripts
sandeep-deriv Aug 19, 2024
6008b2c
JSON Schema Update
Aug 20, 2024
58ca283
Change text authentication to redirect URL
ahmed-deriv Aug 20, 2024
6dd2c4a
JSON Schema Update
Aug 21, 2024
36b8a5c
Merge pull request #99 from ahmed-deriv/ahmed/DAPI-692/fix--text-chan…
sandeep-deriv Aug 21, 2024
a35e7c1
JSON Schema Update
Aug 21, 2024
184fbf3
Update UserNavbarItem.module.scss
ahmed-deriv Aug 21, 2024
8d22377
chore: retrigger
ahmed-deriv Aug 21, 2024
77abecd
chore: update node version
ahmed-deriv Aug 22, 2024
8802c97
chore: :fire: updated engine version
sandeep-deriv Aug 22, 2024
1a39504
update package lock file
ahmed-deriv Aug 22, 2024
c341f7c
Merge pull request #102 from deriv-com/sandeep/update-engine-version
sandeep-deriv Aug 22, 2024
409e112
chore: resolve merge conflicts
sandeep-deriv Aug 22, 2024
5620179
Merge pull request #89 from ahmed-deriv/ahmed/DAPI-626/chore--add-res…
sandeep-deriv Aug 22, 2024
5ac0b2f
fix: resolve conflicts
agrim-deriv Aug 22, 2024
c2d72df
fix: update with master
agrim-deriv Aug 22, 2024
88a460b
chore: resolved merge conflicts
ahmed-deriv Aug 22, 2024
f65a14f
fix: register tokens
agrim-deriv Aug 22, 2024
82b0a83
ahmed/DAPI-662/fix--improve-text-alignment-popups
ahmed-deriv Aug 22, 2024
b7ebd6d
ahmed/DAPI-705/chore--add-unit-test-for-coverage-deriv-api
ahmed-deriv Aug 26, 2024
3a5920b
Merge pull request #94 from ahmed-deriv/ahmed/DAPI-618/feat--update-n…
shafin-deriv Aug 26, 2024
3b90015
Merge remote-tracking branch 'upstream/feature/new-dashboard' into ah…
ahmed-deriv Aug 26, 2024
958bcf6
Merge remote-tracking branch 'upstream/feature/new-dashboard' into ah…
ahmed-deriv Aug 26, 2024
1041ad0
fix: create token
agrim-deriv Aug 26, 2024
ded6d28
Code refactoring and add unit tests
ahmed-deriv Aug 27, 2024
00b875e
Add unit test for api token table
ahmed-deriv Aug 29, 2024
30c5256
Merge pull request #90 from agrim-deriv/Agrim/breadcrumbs
shafin-deriv Aug 30, 2024
062750c
Merge pull request #103 from ahmed-deriv/ahmed/DAPI-662/fix--improve-…
shafin-deriv Aug 30, 2024
91b2bd0
Merge remote-tracking branch 'upstream/feature/new-dashboard' into ah…
ahmed-deriv Sep 2, 2024
ade4d87
add package in json file
ahmed-deriv Sep 2, 2024
2a62dd6
Add unit test for dashboard component and hooks
ahmed-deriv Sep 2, 2024
1cee293
Merge pull request #112 from ahmed-deriv/ahmed/DAPI-705/chore--add-un…
sandeep-deriv Sep 3, 2024
69b47a3
chore: resolved merge conflicts and added missing translation AppRegi…
sandeep-deriv Sep 4, 2024
ce3068b
Merge remote-tracking branch upstream/feature/new-dashboard into ahme…
ahmed-deriv Sep 5, 2024
307d220
fix test case and crash issue
ahmed-deriv Sep 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,15 @@ To ensure smooth running and contribution to this project, please make sure you

git clone [email protected]:deriv-com/deriv-api-docs.git

### Install Dependencies
### Prepare for run - (Install Dependencies & Build)

npm ci // Clean Install

or

npm i // Install
npm run bootstrap

### Run the Project

After successfully building the project, you can execute or debug it using the Terminal by running the following command.

npm run start:dev
npm run dev

### Build the Project

Expand Down
4 changes: 4 additions & 0 deletions _data/v3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ groups:
title: P2P Ping
- name: p2p_settings
title: P2P Settings
- name: partner_settings
title: Get Partner-Specific Account Settings
- name: partner_settings_update
title: Set Partner Account Settings
- name: payment_methods
title: Payment Methods
- name: paymentagent_create
Expand Down
2 changes: 1 addition & 1 deletion config/v3/get_account_status/receive.json
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@
]
},
"status": {
"description": "Account status. Possible status: \n- `address_verified`: client's address is verified by third party services. \n- `allow_document_upload`: client is allowed to upload documents. \n- `age_verification`: client is age-verified. \n- `authenticated`: client is fully authenticated. \n- `cashier_locked`: cashier is locked. \n- `crs_tin_information`: client has updated tax related information. \n- `deposit_locked`: deposit is not allowed. \n- `disabled`: account is disabled. \n- `document_expired`: client's submitted proof-of-identity documents have expired. \n- `document_expiring_soon`: client's submitted proof-of-identity documents are expiring within a month. \n- `dxtrade_password_not_set`: Deriv X password is not set. \n- `financial_assessment_not_complete`: client should complete their financial assessment. \n- `financial_information_not_complete`: client has not completed financial assessment. \n- `financial_risk_approval`: client has accepted financial risk disclosure. \n- `max_turnover_limit_not_set`: client has not set financial limits on their account. Applies to UK and Malta clients. \n- `mt5_password_not_set`: MT5 password is not set. \n- `mt5_withdrawal_locked`: MT5 deposits allowed, but withdrawal is not allowed. \n- `needs_affiliate_coc_approval`: user must approve the Affiliate's Code of Conduct Agreement. \n- `no_trading`: trading is disabled. \n- `no_withdrawal_or_trading`: client cannot trade or withdraw but can deposit. \n- `p2p_blocked_for_pa`: p2p is blocked for the current payment agent client. \n- `pa_withdrawal_explicitly_allowed`: withdrawal through payment agent is allowed. \n- `password_reset_required`: this client must reset their password. \n- `professional`: this client has opted for a professional account. \n- `professional_requested`: this client has requested for a professional account. \n- `professional_rejected`: this client's request for a professional account has been rejected. \n- `social_signup`: this client is using social signup. \n- `trading_experience_not_complete`: client has not completed the trading experience questionnaire. \n- `ukgc_funds_protection`: client has acknowledged UKGC funds protection notice. \n- `unwelcome`: client cannot deposit or buy contracts, but can withdraw or sell contracts. \n- `withdrawal_locked`: deposits allowed but withdrawals are not allowed. \n- `deposit_attempt`: this prevent a client from changing the account currency after deposit attempt. \n- `poi_name_mismatch`: client POI documents name mismatch. \n- `allow_poa_resubmission`: the client can resubmit POA documents. \n- `allow_poi_resubmission`: the client can resubmit POI documents. \n- `shared_payment_method`: the client has been sharing payment methods. \n- `personal_details_locked`: client is not allowed to edit personal profile details. \n- `transfers_blocked`: it block any transfer between two accounts. \n- `df_deposit_requires_poi`: the DF deposit will be blocked until the client gets age verified. \n- `authenticated_with_idv_photoid`: the client has been fully authenticated by IDV. \n- `idv_revoked`: the client used to be fully authenticated by IDV but it was taken away due to compliance criteria. \n- `mt5_additional_kyc_required`: client tax information, place of birth and account opening reason is missing. \n- `poi_expiring_soon`: the POI documents of the client will get expired soon, allow them to reupload POI documents. \n- `poa_expiring_soon`: the POA documents of the client will get outdated soon, allow them to reupload POA documents. \n- `tin_manually_approved`: the client's tax_identification_number has been manually approved as client is not applicable for tax_identification_number",
"description": "Account status. Possible status: \n- `address_verified`: client's address is verified by third party services. \n- `allow_document_upload`: client is allowed to upload documents. \n- `age_verification`: client is age-verified. \n- `authenticated`: client is fully authenticated. \n- `cashier_locked`: cashier is locked. \n- `crs_tin_information`: client has updated tax related information. \n- `deposit_locked`: deposit is not allowed. \n- `disabled`: account is disabled. \n- `document_expired`: client's submitted proof-of-identity documents have expired. \n- `document_expiring_soon`: client's submitted proof-of-identity documents are expiring within a month. \n- `dxtrade_password_not_set`: Deriv X password is not set. \n- `financial_assessment_not_complete`: client should complete their financial assessment. \n- `financial_information_not_complete`: client has not completed financial assessment. \n- `financial_risk_approval`: client has accepted financial risk disclosure. \n- `max_turnover_limit_not_set`: client has not set financial limits on their account. Applies to UK and Malta clients. \n- `mt5_password_not_set`: MT5 password is not set. \n- `mt5_withdrawal_locked`: MT5 deposits allowed, but withdrawal is not allowed. \n- `needs_affiliate_coc_approval`: user must approve the Affiliate's Code of Conduct Agreement. \n- `no_trading`: trading is disabled. \n- `no_withdrawal_or_trading`: client cannot trade or withdraw but can deposit. \n- `p2p_blocked_for_pa`: p2p is blocked for the current payment agent client. \n- `pa_withdrawal_explicitly_allowed`: withdrawal through payment agent is allowed. \n- `password_reset_required`: this client must reset their password. \n- `professional`: this client has opted for a professional account. \n- `professional_requested`: this client has requested for a professional account. \n- `professional_rejected`: this client's request for a professional account has been rejected. \n- `social_signup`: this client is using social signup. \n- `trading_experience_not_complete`: client has not completed the trading experience questionnaire. \n- `unwelcome`: client cannot deposit or buy contracts, but can withdraw or sell contracts. \n- `withdrawal_locked`: deposits allowed but withdrawals are not allowed. \n- `deposit_attempt`: this prevent a client from changing the account currency after deposit attempt. \n- `poi_name_mismatch`: client POI documents name mismatch. \n- `allow_poa_resubmission`: the client can resubmit POA documents. \n- `allow_poi_resubmission`: the client can resubmit POI documents. \n- `shared_payment_method`: the client has been sharing payment methods. \n- `personal_details_locked`: client is not allowed to edit personal profile details. \n- `transfers_blocked`: it block any transfer between two accounts. \n- `df_deposit_requires_poi`: the DF deposit will be blocked until the client gets age verified. \n- `authenticated_with_idv_photoid`: the client has been fully authenticated by IDV. \n- `idv_revoked`: the client used to be fully authenticated by IDV but it was taken away due to compliance criteria. \n- `mt5_additional_kyc_required`: client tax information, place of birth and account opening reason is missing. \n- `poi_expiring_soon`: the POI documents of the client will get expired soon, allow them to reupload POI documents. \n- `poa_expiring_soon`: the POA documents of the client will get outdated soon, allow them to reupload POA documents. \n- `tin_manually_approved`: the client's tax_identification_number has been manually approved as client is not applicable for tax_identification_number",
"type": "array",
"items": {
"type": "string"
Expand Down
4 changes: 4 additions & 0 deletions config/v3/get_settings/receive.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@
"description": "(Optional) Indicates the timestamp for the next verify attempt",
"type": "integer"
},
"session_timestamp": {
"description": "(Optional) Indicates the timestamp for the current's session email code expiry",
"type": "integer"
},
"verified": {
"description": "Indicates the verification status of the client's phone number.",
"type": "integer",
Expand Down
8 changes: 0 additions & 8 deletions config/v3/landing_company/receive.json
Original file line number Diff line number Diff line change
Expand Up @@ -1560,14 +1560,6 @@
1
]
},
"ukgc_funds_protection": {
"description": "Flag to indicate ukgc funds protection setting.",
"type": "integer",
"enum": [
0,
1
]
},
"virtual_company": {
"description": "Virtual Company",
"type": "string"
Expand Down
3 changes: 2 additions & 1 deletion config/v3/mt5_new_account/send.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@
"p01_ts03",
"p01_ts04",
"p02_ts02",
"p03_ts01"
"p03_ts01",
"p03_ts02"
]
},
"state": {
Expand Down
3 changes: 3 additions & 0 deletions config/v3/partner_settings/example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"partner_settings": 1
}
72 changes: 72 additions & 0 deletions config/v3/partner_settings/receive.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Get Partner-Specific Account Settings (response)",
"description": "Get Partner Settings (Partner Type, Company Details etc)",
"type": "object",
"required": [
"echo_req",
"msg_type"
],
"properties": {
"partner_settings": {
"title": "partner_settings",
"description": "Partner-specific information and settings.",
"type": "object",
"additionalProperties": false,
"properties": {
"company_name": {
"description": "[Optional] Company name. Only applicable for partners of type company.",
"type": "string",
"pattern": "^(?!.*\\s{2,})[\\p{L}\\s'.-]{2,50}$",
"sensitive": 1
},
"company_registration_number": {
"description": "[Optional] Company registration number. Only applicable for partners of type company.",
"type": "string",
"pattern": "^(?!^$|\\s+)[A-Za-z0-9.\\/\\s-]{0,25}$"
},
"partner_type": {
"description": "Defines whether this partner is an individual or a company.",
"type": "string",
"enum": [
"individual",
"company"
]
},
"platform_URL": {
"description": "Platform URL for Dynamic works dashboard to be redirected from Partners Hub which will be set in BackOffice.",
"type": "string",
"pattern": "^[\\w_@./:#&+-]*$"
},
"provider": {
"description": "Defines the provider platform.",
"type": "string",
"enum": [
"myaffiliates",
"dynamicworks"
]
},
"website": {
"description": "Partner's Website URI/Promotional Platform",
"type": "string",
"pattern": "^[\\w_@./:#&+-]*$"
}
}
},
"echo_req": {
"description": "Echo of the request made.",
"type": "object"
},
"msg_type": {
"description": "Action name of the request made.",
"type": "string",
"enum": [
"partner_settings"
]
},
"req_id": {
"description": "Optional field sent in request to map to response, present only when request contains `req_id`.",
"type": "integer"
}
}
}
36 changes: 36 additions & 0 deletions config/v3/partner_settings/send.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Get Partner-Specific Account Settings (request)",
"description": "Get Partner Settings (Partner Type, Company Details etc)",
"type": "object",
"auth_required": 1,
"auth_scopes": [
"read"
],
"additionalProperties": false,
"required": [
"partner_settings"
],
"properties": {
"partner_settings": {
"description": "Must be `1`",
"type": "integer",
"enum": [
1
]
},
"loginid": {
"description": "[Optional] The login id of the partner account. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
"passthrough": {
"description": "[Optional] Used to pass data through the websocket, which may be retrieved via the `echo_req` output field.",
"type": "object"
},
"req_id": {
"description": "[Optional] Used to map request to response.",
"type": "integer"
}
}
}
7 changes: 7 additions & 0 deletions config/v3/partner_settings_update/example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"partner_settings_update": 1,
"company_name": "XYZ New Corp",
"company_registration_no": "ABC322",
"partner_type": "company",
"website": "www.newxyz.com"
}
32 changes: 32 additions & 0 deletions config/v3/partner_settings_update/receive.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Set Partner Account Settings (response)",
"description": "A message with Partner Settings",
"type": "object",
"required": [
"echo_req",
"msg_type"
],
"properties": {
"partner_settings_update": {
"title": "partner_settings_update",
"description": "1 on success",
"type": "integer"
},
"echo_req": {
"description": "Echo of the request made.",
"type": "object"
},
"msg_type": {
"description": "Action name of the request made.",
"type": "string",
"enum": [
"partner_settings_update"
]
},
"req_id": {
"description": "Optional field sent in request to map to response, present only when request contains `req_id`.",
"type": "integer"
}
}
}
60 changes: 60 additions & 0 deletions config/v3/partner_settings_update/send.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Set Partner Account Settings (request)",
"description": "A message with Partner Settings",
"type": "object",
"auth_required": 1,
"auth_scopes": [
"admin"
],
"additionalProperties": false,
"required": [
"partner_settings_update"
],
"properties": {
"partner_settings_update": {
"description": "Must be `1`",
"type": "integer",
"enum": [
1
]
},
"company_name": {
"description": "[Optional] Company name. Only applicable for partners of type company.",
"type": "string",
"pattern": "^(?!.*\\s{2,})[\\p{L}\\s'.-]{2,50}$",
"sensitive": 1
},
"company_registration_no": {
"description": "[Optional] Company registration number. Only applicable for partners of type company.",
"type": "string",
"pattern": "^(?!^$|\\s+)[A-Za-z0-9.\\/\\s-]{0,25}$"
},
"partner_type": {
"description": "Defines whether this partner is an individual or a company.",
"type": "string",
"enum": [
"individual",
"company"
]
},
"website": {
"description": "Partner's Website URI/Promotional Platform",
"type": "string",
"pattern": "^[\\w_@./:#&+-]*$"
},
"loginid": {
"description": "[Optional] The login id of the partner account. Mandatory when multiple tokens were provided during authorize.",
"type": "string",
"pattern": "^[A-Za-z]+[0-9]+$"
},
"passthrough": {
"description": "[Optional] Used to pass data through the websocket, which may be retrieved via the `echo_req` output field.",
"type": "object"
},
"req_id": {
"description": "[Optional] Used to map request to response.",
"type": "integer"
}
}
}
Loading