Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added src/ui/assets/images/Keriblox-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src/ui/components/CardList/CardList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import "./CardList.scss";
import { CardItemProps, CardListProps } from "./CardList.types";
import CitizenPortal from "../../assets/images/citizen-portal.svg";
import Socialbook from "../../assets/images/socialbook.svg";
import KeribloxLogo from "../../assets/images/Keriblox-logo.png";

const CardInfo = <T extends object = object>({
index,
Expand Down Expand Up @@ -50,6 +51,18 @@ const CardInfo = <T extends object = object>({
</div>
);
}
if (card.title === "Keriblox") {
return (
<div className="socialbook-logo-container">
<img
src={KeribloxLogo}
alt={card.title}
className="card-logo"
data-testid="card-logo"
/>
</div>
);
}

if (card.image) {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ interface IdentifierDetailModalProps
const QR_CODE_TYPES = {
GUARDIANSHIP: "guardianship",
SOCIALMEDIA: "socialmedia",
KERIBLOX: "keriblox",
} as const;

const ERROR_MESSAGES = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { IonIcon } from "@ionic/react";
import { personCircleOutline } from "ionicons/icons";
import { useEffect, useState } from "react";
import { i18n } from "../../../../../i18n";
import { ResponsivePageLayout } from "../../../layout/ResponsivePageLayout";
import { PageFooter } from "../../../PageFooter";
import { PageHeader } from "../../../PageHeader";
import CitizenPortal from "../../../../assets/images/citizen-portal.svg";
import Socialbook from "../../../../assets/images/socialbook.svg";
import "./IncomingRequest.scss";
import KeribloxIcon from "../../../../assets/images/Keriblox-logo.png";
import { IncomingRequestProps } from "./IncomingRequest.types";
import { useEffect, useState } from "react";
import { QR_CODE_TYPES } from "../../ProfileDetailsModal.types";
import { IonIcon } from "@ionic/react";
import { personCircleOutline } from "ionicons/icons";
import "./IncomingRequest.scss";

const IncomingRequest = ({
setShowConfirmation,
Expand All @@ -36,6 +37,9 @@ const IncomingRequest = ({
} else if (type === QR_CODE_TYPES.SOCIALMEDIA) {
setRequester("Socialbook");
setLogo(Socialbook);
} else if (type === QR_CODE_TYPES.KERIBLOX) {
setRequester("Keriblox");
setLogo(KeribloxIcon);
}
}
}, [type]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import { CredentialRequestProps, MemberInfo } from "../CredentialRequest.types";
import { LightCredentialDetailModal } from "../LightCredentialDetailModal";
import "./CredentialRequestInformation.scss";
import CitizenPortal from "../../../../../assets/images/citizen-portal.svg";
import KeribloxLogo from "../../../../../assets/images/Keriblox-logo.png";
import Socialbook from "../../../../../assets/images/socialbook.svg";

const CredentialRequestInformation = ({
Expand Down Expand Up @@ -89,6 +90,8 @@ const CredentialRequestInformation = ({
setRequester("Citizen Portal");
} else if (type === "socialmedia") {
setRequester("Socialbook");
} else if (type === "keriblox") {
setRequester("Keriblox");
} else {
setRequester(connection.label || i18n.t("tabs.connections.unknown"));
}
Expand Down Expand Up @@ -345,6 +348,18 @@ const CredentialRequestInformation = ({
);
}

if (requester === "Keriblox") {
return (
<div className="socialbook-logo-container">
<img
src={KeribloxLogo}
className="card-logo"
data-testid="card-logo"
/>
</div>
);
}

return <FallbackIcon src={connection?.logo} />;
})();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { showError } from "../../../../utils/error";
import { NotificationDetailsProps } from "../../NotificationDetails.types";
import CitizenPortal from "../../../../assets/images/citizen-portal.svg";
import Socialbook from "../../../../assets/images/socialbook.svg";
import KeribloxLogo from "../../../../assets/images/Keriblox-logo.png";
import { ResponsivePageLayout } from "../../../../components/layout/ResponsivePageLayout";
import "./CredentialShareRequest.scss";

Expand Down Expand Up @@ -50,6 +51,8 @@ const CredentialShareRequest = ({
setRequester("Citizen Portal");
} else if (type === "socialmedia") {
setRequester("Socialbook");
} else if (type === "keriblox") {
setRequester("Keriblox");
} else {
setRequester(connection.label || i18n.t("tabs.connections.unknown"));
}
Expand All @@ -61,6 +64,16 @@ const CredentialShareRequest = ({
}
}, [notificationDetails.connectionId]);

let logoToRender = "";

if (requester === "Citizen Portal") {
logoToRender = CitizenPortal;
} else if (requester === "Socialbook") {
logoToRender = Socialbook;
} else if (requester === "Keriblox") {
logoToRender = KeribloxLogo;
}

useEffect(() => {
if (requester === i18n.t("tabs.connections.unknown")) {
check();
Expand Down Expand Up @@ -104,9 +117,7 @@ const CredentialShareRequest = ({
<div className="credential-share-request-center">
<div className="credential-share-request-icons-row">
<div className="credential-share-request-user-logo">
<img
src={requester === "Socialbook" ? Socialbook : CitizenPortal}
/>
<img src={logoToRender} />
</div>
</div>
<p className="credential-share-request-message">
Expand Down
16 changes: 16 additions & 0 deletions src/ui/pages/Notifications/NotificationItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { timeDifference } from "../../utils/formatters";
import { NotificationItemProps } from "./Notification.types";
import CitizenPortal from "../../assets/images/citizen-portal.svg";
import Socialbook from "../../assets/images/socialbook.svg";
import KeribloxLogo from "../../assets/images/Keriblox-logo.png";

const NotificationItem = ({
item,
Expand Down Expand Up @@ -64,6 +65,8 @@ const NotificationItem = ({
setConnectionName("Citizen Portal");
} else if (type === "socialmedia") {
setConnectionName("Socialbook");
} else if (type === "keriblox") {
setConnectionName("Keriblox");
} else {
setConnectionName(connection.label || "Unknown");
}
Expand Down Expand Up @@ -194,6 +197,19 @@ const NotificationItem = ({
);
}

if (connectionName === "Keriblox") {
return (
<div className="socialbook-logo-container">
<img
src={KeribloxLogo}
alt={connectionName}
className="card-logo"
data-testid="card-logo"
/>
</div>
);
}

return (
<FallbackIcon
alt="notifications-tab-item-logo"
Expand Down
Loading