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.

Sign up for GitHub

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

MOSIP-39146: Resolved the bug #1144

Merged
merged 2 commits into from
Jan 24, 2025
Merged

MOSIP-39146: Resolved the bug #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddeeafc
MOSIP-39146: Resolved the bug
Anil-kumar-Majji Jan 24, 2025
1d344e5
MOSIP-39146: Resolved the bug
Anil-kumar-Majji Jan 24, 2025
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
9 changes: 6 additions & 3 deletions pmp-revamp-ui/src/pages/partner/deviceProviderServices/SbiList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import verifiedIcon from '../../../svg/verified_icon.svg';
import expiredIcon from '../../../svg/expiry_icon.svg';
import deactivatedIcon from '../../../svg/deactivated_shield_icon.svg';
import DeactivatePopup from '../../common/DeactivatePopup.js';
import deactivateIcon from "../../../svg/deactivate_icon.svg";
import disableDeactivateIcon from "../../../svg/disable_deactivate_icon.svg";

function SbiList() {
const { t } = useTranslation();
Expand Down Expand Up @@ -236,9 +238,10 @@ function SbiList() {

{deactivateBtnId === index && (
<div className={`z-50 w-[15rem] min-w-fit absolute top-full mt-2 ${sbi.status === "approved" ? 'text-[#3E3E3E]' : 'text-[#A5A5A5]'} bg-white ${isLoginLanguageRTL ? "left-[3.25rem]" : "right-[3.25rem]"} rounded-md font-semibold shadow-lg hover:bg-gray-100 ring-gray-50 border duration-200`}>
<button id='sbi_list_deactivate' onClick={() => onClickDeactivate(sbi)} className={`${isLoginLanguageRTL ? "text-right" : "text-left"} px-4 py-2 text-sm font-medium ${sbi.status !== "approved" ? ' cursor-auto' : 'cursor-pointer'}`}>
<p> {t('sbiList.deactivate')} </p>
</button>
<div role='button' id='sbi_list_deactivate' onClick={() => onClickDeactivate(sbi)} className={`${isLoginLanguageRTL ? "text-right" : "text-left"} px-4 py-2 flex justify-between text-sm font-medium ${sbi.status !== "approved" ? ' cursor-auto' : 'cursor-pointer'}`}>
<p>{t('sbiList.deactivate')}</p>
<img src={sbi.status === "approved" ? deactivateIcon : disableDeactivateIcon} alt="" className={`${isLoginLanguageRTL ? "pl-2" : "pr-2"}`} />
</div>
</div>
)}
{showDeactivatePopup && (
Expand Down
5 changes: 4 additions & 1 deletion pmp-revamp-ui/src/pages/partner/ftmProviderServices/FtmList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import FtmListFilter from './FtmListFilter';
import SortingIcon from '../../common/SortingIcon';
import Pagination from '../../common/Pagination';
import viewIcon from "../../../svg/view_icon.svg";
import manageCertificate from '../../../svg/manage_certificate_icon.svg';
import disableManageCertificate from '../../../svg/disabled_manage_certificate_icon.svg';
import disableDeactivateIcon from "../../../svg/disable_deactivate_icon.svg";
import deactivateIcon from "../../../svg/deactivate_icon.svg";
import DeactivatePopup from '../../common/DeactivatePopup';
Expand Down Expand Up @@ -315,8 +317,9 @@ function FtmList() {
<img src={viewIcon} alt="" className={`${isLoginLanguageRTL ? "pl-2" : "pr-2"}`} />
</div>
<hr className="h-px bg-gray-200 border-0 mx-1" />
<div role='button' id='ftm_list_manage_certificate' onClick={() => showManageCertificate(ftm)} className={`py-2 w-full px-2 ${isLoginLanguageRTL ? "pl-10 text-right" : "pr-10 text-left"} ${(ftm.status === "approved" || ftm.status === "pending_cert_upload") ? 'text-[#3E3E3E] cursor-pointer' : 'text-[#A5A5A5] cursor-auto'} hover:bg-gray-100`}>
<div role='button' id='ftm_list_manage_certificate' onClick={() => showManageCertificate(ftm)} className={`flex justify-between py-2 w-full px-2 ${isLoginLanguageRTL ? "text-right" : "text-left"} ${(ftm.status === "approved" || ftm.status === "pending_cert_upload") ? 'text-[#3E3E3E] cursor-pointer' : 'text-[#A5A5A5] cursor-auto'} hover:bg-gray-100`}>
<p> {t('ftmList.manageCertificate')} </p>
<img src={(ftm.status === "approved" || ftm.status === "pending_cert_upload") ? manageCertificate : disableManageCertificate} alt="" className={`${isLoginLanguageRTL ? "pl-2" : "pr-2"}`} />
</div>
<hr className="h-px bg-gray-200 border-0 mx-1" />
<div role='button' id='ftm_list_deactivate' onClick={() => showDeactivateFtm(ftm)} className={`flex justify-between py-2 px-2 ${ftm.status === "approved" ? 'text-[#3E3E3E] cursor-pointer' : 'text-[#A5A5A5] cursor-auto'} hover:bg-gray-100`} >
Expand Down
6 changes: 6 additions & 0 deletions pmp-revamp-ui/src/svg/disabled_manage_certificate_icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions pmp-revamp-ui/src/svg/manage_certificate_icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading