diff --git a/src/app/styles/global-styles.scss b/src/app/styles/global-styles.scss
index 22102d4..f86429a 100644
--- a/src/app/styles/global-styles.scss
+++ b/src/app/styles/global-styles.scss
@@ -1309,6 +1309,22 @@
border-radius: 20px;
overflow: hidden;
+ .status {
+ &-active,
+ &-verified {
+ color: #166534;
+ }
+
+ &-expired,
+ &-unverified {
+ color: #991b1b;
+ }
+
+ &-pending {
+ color: #92400e;
+ }
+ }
+
&-content {
padding: 10px;
max-height: calc(90vh - 80px);
diff --git a/src/app/ui/users/user-info-modal-window.tsx b/src/app/ui/users/user-info-modal-window.tsx
index e8f87af..3e41bbb 100644
--- a/src/app/ui/users/user-info-modal-window.tsx
+++ b/src/app/ui/users/user-info-modal-window.tsx
@@ -63,11 +63,9 @@ export function UserInfoModalWindow({
};
const getGenderText = (gender: string) => {
- return gender === 'MALE' ? 'Male' : 'Female';
+ return gender === 'MALE' ? t('male') : t('female');
};
- console.log(userInfo)
-
return (
@@ -75,14 +73,14 @@ export function UserInfoModalWindow({
{/* Карточка информации о пользователе */}
-
{t('userInformation') || 'User Information'}
+ {t('userInformation')}
- {t('fullName') || 'Full Name'}:
+ {t('fullName')}:
- {userInfo.fullName}
+ {userInfo?.fullName ? userInfo.fullName : '-'}
@@ -90,15 +88,15 @@ export function UserInfoModalWindow({
{t('email')}:
- {userInfo.email}
+ {userInfo?.email ? userInfo.email : '-'}
- {t('phone') || 'Phone'}:
+ {t('phone')}:
- {userInfo.phone}
+ {userInfo?.phone ? userInfo.phone : '-'}
@@ -106,39 +104,39 @@ export function UserInfoModalWindow({
{t('company')}:
- {userInfo.company || '-'}
+ {userInfo?.company ? userInfo.company : '-'}
- {t('gender') || 'Gender'}:
+ {t('gender')}:
- {getGenderText(userInfo.genderType)}
+ {getGenderText(userInfo?.genderType)}
- {t('birthday') || 'Birthday'}:
+ {t('birthday')}:
- {userInfo.birthday ? formatDate(userInfo.birthday) : '-'}
+ {userInfo?.birthday ? formatDate(userInfo.birthday) : '-'}
- {t('createdAt') || 'Registered'}:
+ {t('createdAt')}:
- {formatDateTime(userInfo.createdAt)}
+ {formatDateTime(userInfo?.createdAt)}
- {t('verifiedStatus') || 'Verification Status'}:
+ {t('verifiedStatus')}:
- {getStatusBadge(userInfo.verifiedStatus)}
+ {getStatusBadge(userInfo?.verifiedStatus)}
@@ -146,7 +144,7 @@ export function UserInfoModalWindow({
{t('active')}:
- {userInfo.active ? 'active' : 'not active'}
+ {userInfo?.active ? 'active' : 'not active'}
@@ -154,46 +152,46 @@ export function UserInfoModalWindow({
{/* Карточка информации о тарифе */}
-
{t('tariffInformation') || 'Tariff Information'}
+ {t('tariffInformation')}
- {t('tariffName') || 'Tariff'}:
+ {t('tariffName')}:
- {userInfo.tariffInfo.tariffName}
+ {userInfo?.tariffInfo?.tariffName ? userInfo?.tariffInfo?.tariffName : '-'}
- {t('tariffStatus') || 'Status'}:
+ {t('tariffStatus')}:
- {getStatusBadge(userInfo.tariffInfo.status)}
+ {getStatusBadge(userInfo?.tariffInfo?.status)}
- {t('tokens') || 'Tokens'}:
+ {t('tokens')}:
- {userInfo.tariffInfo.tokens || 0}
+ {userInfo?.tariffInfo?.tokens ? userInfo?.tariffInfo?.tokens : '-'}
- {t('startDate') || 'Start Date'}:
+ {t('startDate')}:
- {formatDate(userInfo.tariffInfo.startTariff)}
+ {formatDate(userInfo?.tariffInfo?.startTariff)}
- {t('endDate') || 'End Date'}:
+ {t('endDate')}:
- {formatDate(userInfo.tariffInfo.endTariff)}
+ {formatDate(userInfo?.tariffInfo?.endTariff)}
@@ -202,22 +200,22 @@ export function UserInfoModalWindow({
{/* Карточка использования диска */}
-
{t('storageInformation') || 'Storage Information'}
+ {t('storageInformation')}
- {t('diskUsage') || 'Disk Usage'}:
+ {t('diskUsage')}:
- {formatBytes(userInfo.tariffInfo.currentFileOnDisk)} / {formatBytes(userInfo.tariffInfo.maxFileOnDisk)}
+ {formatBytes(userInfo?.tariffInfo?.currentFileOnDisk)} / {formatBytes(userInfo?.tariffInfo?.maxFileOnDisk)}
- {t('fileCount') || 'Files'}:
+ {t('fileCount')}:
- {userInfo.tariffInfo.currentFileCounts} / {userInfo.tariffInfo.maxFileCounts}
+ {userInfo?.tariffInfo?.currentFileCounts} / {userInfo?.tariffInfo?.maxFileCounts}