Skip to content
This repository has been archived by the owner on Feb 22, 2024. It is now read-only.

thisyahlen/fix view disabled button #7278

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

thisyahlen/fix view disabled button #7278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d0d7141
fix view disabled button
thisyahlen-deriv Oct 27, 2022
b62bf9a
Merge branch 'master' into thisyahlen/79503/viewbtndisabledfix
matin-deriv Jan 30, 2023
596fe3a
fix: move Derived to the correct position based on requirements (#7287)
aizad-deriv Jan 30, 2023
ef449b2
fixed POI broken page for refuted clients (#7289)
suisin-deriv Jan 30, 2023
cd9ec06
Suisin/Changes on authenticate.js to show Manual Upload after Onfido …
suisin-deriv Jan 30, 2023
8b9d036
fix: blank page caused by disallowed synthetics (#7305)
maryia-deriv Jan 30, 2023
e80f1d5
Aizad/Fix Derived toggle click on reload (#7293)
aizad-deriv Jan 30, 2023
682f30a
Merge branch 'thisyahlen/79503/viewbtndisabledfix' of github.com:this…
thisyahlen-deriv Jan 31, 2023
edb2799
fix: disabled view button
thisyahlen-deriv Jan 31, 2023
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
2 changes: 1 addition & 1 deletion src/javascript/app/common/active_symbols.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const submarket_order = {
};

const ActiveSymbols = (() => {
const groupBy = (xs, key) => (
const groupBy = (xs = [], key) => (
xs.reduce((rv, x) => {
(rv[x[key]] = rv[x[key]] || []).push(x);
return rv;
Expand Down
67 changes: 48 additions & 19 deletions src/javascript/app/pages/trade/markets.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ const List = ({
) : (
<div key={`${item}_${idx}`}>
<div
className='market'
className='subgroup'
key={idx}
id={`${obj.key}_market`}
ref={saveRef.bind(null,obj.key)}
>
{(obj.key === derived_category && isMobile()) && <div className='label'>{obj.subgroup_name}</div>}
<div className='market_name'>
<div className='subgroup_name'>
{obj.name}
</div>
{Object.entries(obj.submarket).sort((a, b) => sortSubmarket(a[0], b[0]))
Expand Down Expand Up @@ -191,7 +191,10 @@ class Markets extends React.Component {
};

toggleAccordion = () => {
this.setState({ open_accordion: !this.state.open_accordion });
this.setState((prevState) => ({
...prevState,
open_accordion: !prevState.open_accordion,
}));
}

getCurrentUnderlying = () => {
Expand Down Expand Up @@ -228,7 +231,6 @@ class Markets extends React.Component {
} else {
this.setState({
subgroup_active: false,
open_accordion : false,
});
}
}
Expand Down Expand Up @@ -329,6 +331,7 @@ class Markets extends React.Component {
const class_under = 'put_under';
const TITLE_HEIGHT = 40;
const DEFAULT_TOP = this.references.list.offsetTop;
const SUBGROUP_LABEL = document.getElementsByClassName('label');

const current_viewed_node = Object.values(market_nodes).find(node => (
node.dataset.offsetTop <= position
Expand All @@ -355,11 +358,12 @@ class Markets extends React.Component {
current_viewed_node.children[0].removeAttribute('style');
current_viewed_node.children[0].classList.remove(class_under);
}
if (Object.values(current_viewed_node.children[0].classList).includes('label')) {
current_viewed_node.children[1].classList.add(class_sticky);
} else {
current_viewed_node.children[0].classList.add(class_sticky);
if (isMobile() && (current_viewed_node.classList.contains('subgroup') && !current_viewed_node.classList.contains('label'))) {
SUBGROUP_LABEL[0].classList.add(class_sticky);
SUBGROUP_LABEL[0].removeAttribute('style');
SUBGROUP_LABEL[0].classList.remove(class_under);
}
current_viewed_node.children[0].classList.add(class_sticky);
current_viewed_node.style.paddingTop = `${TITLE_HEIGHT}px`;
}

Expand Down Expand Up @@ -521,11 +525,16 @@ class Markets extends React.Component {
<div>
{group_markets[item].markets.map((m) => (
<div
className={`market ${active_market === m.key ? 'active' : ''}`}
className={classNames('market', {
'active': active_market === m.key,
})}
key={m.key}
onClick={scrollToMarket.bind(null, `${m.key}`)}
>
<span className={`icon ${m.key} ${active_market === m.key ? 'active' : ''}`} />
<span className={classNames(`icon ${m.key}`, {
'active': active_market === m.key,
})}
/>
<span>{m.name}</span>
</div>))}
</div>
Expand All @@ -536,18 +545,30 @@ class Markets extends React.Component {
>
<div
className={classNames('market', {
'active': subgroup_active,
'active' : subgroup_active,
'accordion-label': !!open_accordion,
})}
onClick={toggleAccordion || (subgroup_active ? toggleAccordion : '')}
onClick={toggleAccordion}
>
<span className={`icon synthetic_index ${open_accordion ? 'active' : ''}`} />
<span className={classNames('icon synthetic_index', {
'active': subgroup_active,
})}
/>
<span>{group_markets[item].markets[0].subgroup_name}</span>
<span className={`accordion-icon icon ${open_accordion ? 'active' : ''}`} />
<span className={classNames('accordion-icon icon', {
'active': open_accordion,
})}
/>
</div>
<div className={`${open_accordion ? 'accordion-content--active' : 'accordion-content'}`}>
<div className={classNames('accordion-content', {
'accordion-content--active': open_accordion,
})}
>
{group_markets[item].markets.map((m) => (
<div
className={`subgroup market ${active_market === m.key ? 'subgroup-active' : ''}`}
className={classNames('subgroup market', {
'subgroup-active': active_market === m.key,
})}
key={m.key}
onClick={scrollToMarket.bind(null, `${m.key}`)}
>
Expand All @@ -574,9 +595,14 @@ class Markets extends React.Component {
onClick = {scrollToMarket.bind(null, m.key)}
key = {m.key}
data-market = {m.key}
className={active_market === m.key ? 'active' : ''}
className={classNames('', {
'active': active_market === m.key,
})}
>
<span className={`icon ${m.key} ${active_market === m.key ? 'active' : ''}`} />
<span className={classNames(`icon ${m.key}`, {
'active': active_market === m.key,
})}
/>
</li>
))}
</React.Fragment>
Expand All @@ -589,7 +615,10 @@ class Markets extends React.Component {
'active': (active_market === derived_category || subgroup_active),
})}
>
<span className={`icon synthetic_index ${(active_market === derived_category || subgroup_active) ? 'active' : ''}`} />
<span className={classNames('icon synthetic_index', {
'active': active_market === derived_category || subgroup_active,
})}
/>
</li>
)
);
Expand Down
35 changes: 28 additions & 7 deletions src/javascript/app/pages/user/account/authenticate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,9 @@ const Authenticate = (() => {
$('#idv_document_failed_try_again_btn').setVisibility(0);
$('#idv_document_failed_text').setVisibility(1);
$('#idv_document_failed_upload_btn').setVisibility(1);
$('#idv_document_failed_upload_btn').on('click', () => {
$('#idv_document_failed_upload_btn').on('click', (e) => {
e.preventDefault();
e.stopPropagation();
$('#idv_document_failed').setVisibility(0);
if (Number(onfido_submissions_left) > 0) {
handleCountrySelector();
Expand Down Expand Up @@ -1376,7 +1378,7 @@ const Authenticate = (() => {
case 'suspected':
case 'rejected':
if (Number(submissions_left) < 1) {
$('#limited_poi').setVisibility(1);
handleManual();
} else {
const maximum_reasons = rejected_reasons.slice(0, 3);
const has_minimum_reasons = rejected_reasons.length > 3;
Expand Down Expand Up @@ -1438,13 +1440,32 @@ const Authenticate = (() => {
}
};

const handleManual = () => {
$('#idv-container').setVisibility(0);
const handleManual = async () => {
account_status = await getAccountStatus();
const { manual } = account_status.authentication.identity.services;
const { status } = manual;
$('#authentication_tab').setVisibility(1);
$('#msg_personal_details').setVisibility(1);
TabSelector.updateTabDisplay();
$('#not_authenticated_uns').setVisibility(1);
initUnsupported();

switch (status){
case 'none':
$('#idv-container').setVisibility(0);
$('#msg_personal_details').setVisibility(1);
$('#not_authenticated_uns').setVisibility(1);
initUnsupported();
break;
case 'pending':
$('#idv-container').setVisibility(0);
$('#upload_complete').setVisibility(1);
break;
case 'rejected':
case 'suspected':
$('#idv-container').setVisibility(0);
$('#limited_poi').setVisibility(1);
break;
default:
break;
}
};

const initAuthentication = async () => {
Expand Down
6 changes: 1 addition & 5 deletions src/javascript/app/pages/user/view_popup/view_popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,8 @@ const ViewPopup = (() => {
ViewPopupUI.setOnCloseFunction(onClose);
}

if (btn_view) {
ViewPopupUI.disableButton($(btn_view));
ViewPopupUI.cleanup(false);
}

getContract();

};

const responseContract = (response) => {
Expand Down
Loading