From 280450a44c80598b241f713e47611e4b9207bd0a Mon Sep 17 00:00:00 2001
From: Vitali Karpuk <vitalikkarpuk652@gmail.com>
Date: Tue, 9 Jul 2024 12:04:27 +0300
Subject: [PATCH] added redirect

---
 .../components/activity/constants.ts             |  2 +-
 .../accountConent/components/activity/index.tsx  |  9 +++++++--
 .../components/activity/index.tsx                |  1 -
 .../templates/linkTemplate/linkTemplate.tsx      | 16 +++++++++-------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ui/components/organisms/accountConent/components/activity/constants.ts b/ui/components/organisms/accountConent/components/activity/constants.ts
index db2a23b..d39f7da 100644
--- a/ui/components/organisms/accountConent/components/activity/constants.ts
+++ b/ui/components/organisms/accountConent/components/activity/constants.ts
@@ -6,7 +6,7 @@ export const activitiesConfig: TableConfig[] = [
   {
     colName: "DomainName",
     headerText: "Domain Name",
-    columnTemplate: TableTemplates.STRING,
+    columnTemplate: TableTemplates.LINK,
     fields: {
       value: "domainName",
       link:  'domainNameRedirect'
diff --git a/ui/components/organisms/accountConent/components/activity/index.tsx b/ui/components/organisms/accountConent/components/activity/index.tsx
index 6db6af2..5a4e941 100644
--- a/ui/components/organisms/accountConent/components/activity/index.tsx
+++ b/ui/components/organisms/accountConent/components/activity/index.tsx
@@ -41,8 +41,12 @@ const ActivityContent = (): JSX.Element => {
           content: response?.content?.map((item) => {
             return {
               ...item,
-              domainNameRedirect: `${Routs.NAME}/${item.id}`,
-              redirectLink: `https://minascan.io/${chain}/tx/${item.transaction}`,
+              domainNameRedirect: `${Routs.NAME}/${item.domainId}`,
+              ...(item.transaction
+                ? {
+                    redirectLink: `https://minascan.io/${chain}/tx/${item.transaction}`,
+                  }
+                : []),
               domainName: addMinaText(item?.domainName),
             };
           }),
@@ -60,6 +64,7 @@ const ActivityContent = (): JSX.Element => {
   const onPage = (page) => {
     setPage(page);
   };
+  console.log(activities);
 
   return (
     <Table
diff --git a/ui/components/organisms/detailsNameInfo/components/activity/index.tsx b/ui/components/organisms/detailsNameInfo/components/activity/index.tsx
index 4798854..457f7c3 100644
--- a/ui/components/organisms/detailsNameInfo/components/activity/index.tsx
+++ b/ui/components/organisms/detailsNameInfo/components/activity/index.tsx
@@ -37,7 +37,6 @@ const ActivityContent = ({
           content: response?.content?.map((item) => {
             return {
               ...item,
-              domainNameRedirect: `${Routs.NAME}/${item.id}`,
               redirectLink: `https://minascan.io/${chain}/tx/${item.transaction}`,
               domainName: addMinaText(item?.domainName),
             };
diff --git a/ui/components/organisms/table/templates/linkTemplate/linkTemplate.tsx b/ui/components/organisms/table/templates/linkTemplate/linkTemplate.tsx
index a5fd30a..312a1b2 100644
--- a/ui/components/organisms/table/templates/linkTemplate/linkTemplate.tsx
+++ b/ui/components/organisms/table/templates/linkTemplate/linkTemplate.tsx
@@ -3,20 +3,22 @@ import { FC } from "react";
 
 import style from "./index.module.css";
 import TruncateText from "@/components/molecules/truncateText";
+import StringTemplate from "../stringTemplate";
+import { TableConfig } from "@/comman/types";
 
 type LinkTemplateProps = {
   data: any;
-  config: {
-    fields: {
-      link: string;
-      value: string;
-    };
-  };
+  config: TableConfig;
 };
-const LinkTemplate: FC<LinkTemplateProps> = ({ data, config }) => {
+const LinkTemplate: FC<LinkTemplateProps> = (props) => {
+  const { data, config } = props;
   const link = data[config.fields.link];
   const value = data[config.fields.value];
 
+  if (value && !link) {
+    return <StringTemplate {...props}/>;
+  }
+
   return (
     <>
       {link && value ? (