chore: fix border row in detail page

rango-exchange · Dec 4, 2023 · 7815bc1 · 7815bc1
1 parent c333875
commit 7815bc1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/components/detail/SwapDetailSummary/index.tsx b/components/detail/SwapDetailSummary/index.tsx
@@ -20,7 +20,7 @@ function SwapDetailSummary(props: PropsType) {
         <ButtonCopyIcon text={id} />
       </p>
       <div className="pt-35 px-20">
-        {columns.map((col) => {
+        {columns.map((col, index) => {
           const DetailValueComponent = col.component;
           const { title, id } = col;
           return (
@@ -33,7 +33,7 @@ function SwapDetailSummary(props: PropsType) {
                   <DetailValueComponent column={col} details={details} />
                 )}
               </div>
-              {title !== 'Initiation Date And Time' && (
+              {index !== columns.length - 1 && (
                 <div className="h-[0.5px] w-full bg-neutral-300"></div>
               )}
             </>

diff --git a/components/detail/SwapSteps/SwapStepItemExpanded.tsx b/components/detail/SwapSteps/SwapStepItemExpanded.tsx
@@ -24,22 +24,27 @@ function SwapStepItemExpanded(props: SwapStepItemExpandedProps) {
       </div>
 
       <div className="pt-25">
-        {columns.map((col) => {
+        {columns.map((col, index) => {
           const StepValueComponent = col.component;
           const { title, id } = col;
           return (
-            <div key={`column-${id}`} className="grid grid-cols-7">
-              <div className="text-16 font-medium p-16 pl-0 col-span-3 text-primary-500 flex items-center">
-                {`${title} : `}
+            <>
+              <div key={`column-${id}`} className="grid grid-cols-7">
+                <div className="text-16 font-medium p-16 pl-0 col-span-3 text-primary-500 flex items-center">
+                  {`${title} : `}
+                </div>
+                {StepValueComponent && (
+                  <StepValueComponent
+                    firstStep={firstStep}
+                    column={col}
+                    step={step}
+                  />
+                )}
               </div>
-              {StepValueComponent && (
-                <StepValueComponent
-                  firstStep={firstStep}
-                  column={col}
-                  step={step}
-                />
+              {index !== columns.length - 1 && (
+                <div className="h-[0.5px] w-full bg-neutral-300"></div>
               )}
-            </div>
+            </>
           );
         })}
       </div>