fix: fix dates

kleros · May 21, 2024 · b5564cc · b5564cc
1 parent b28dd0e
commit b5564cc
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 35 deletions.
diff --git a/web/src/components/PreviewCard/Terms/Description.tsx b/web/src/components/PreviewCard/Terms/Description.tsx
@@ -21,7 +21,7 @@ interface IDescription {
   sendingQuantity: string;
   sendingToken: string;
   sellerAddress: string;
-  deadlineDate: Date;
+  deadline: number;
   assetSymbol: string;
   buyer: string;
 }
@@ -35,23 +35,23 @@ const Description: React.FC<IDescription> = ({
   sendingQuantity,
   sendingToken,
   sellerAddress,
-  deadlineDate,
+  deadline,
   assetSymbol,
 }) => {
   const generalEscrowSummary = (
     <>
       By Paying {sendingQuantity}{" "}
       <InlineBlockSpan>{assetSymbol ? assetSymbol : <StyledSkeleton width={30} />}</InlineBlockSpan>, address{" "}
       {buyerAddress} should receive "{deliverableText}" from address {sellerAddress} before the delivery deadline{" "}
-      {new Date(deadlineDate).toString()}.
+      {new Date(deadline).toString()}.
     </>
   );
 
   const cryptoSwapSummary = (
     <>
       By Paying {sendingQuantity} {sendingToken}, [Blockchain] address {buyerAddress} should receive {receivingQuantity}{" "}
       {receivingToken} at the [Blockchain] address {sellerAddress} from [Blockchain] address TODO before the delivery
-      deadline {new Date(deadlineDate).toString()}.
+      deadline {new Date(deadline).toString()}.
     </>
   );
 

diff --git a/web/src/components/PreviewCard/Terms/index.tsx b/web/src/components/PreviewCard/Terms/index.tsx
@@ -19,7 +19,7 @@ interface ITerms {
   sendingQuantity: string;
   sendingToken: string;
   sellerAddress: string;
-  deadlineDate: Date;
+  deadline: number;
   assetSymbol: string;
   extraDescriptionUri: string;
   buyer: string;
@@ -32,24 +32,26 @@ const Terms: React.FC<ITerms> = ({
   buyerAddress,
   sendingQuantity,
   sellerAddress,
-  deadlineDate,
+  deadline,
   assetSymbol,
   extraDescriptionUri,
 }) => {
   return (
     <Container>
       <Header />
       <Description
-        escrowType={escrowType}
-        deliverableText={deliverableText}
-        receivingQuantity={receivingQuantity}
-        buyerAddress={buyerAddress}
-        sendingQuantity={sendingQuantity}
-        sellerAddress={sellerAddress}
-        deadlineDate={deadlineDate}
-        assetSymbol={assetSymbol}
+        {...{
+          escrowType,
+          deliverableText,
+          receivingQuantity,
+          buyerAddress,
+          sendingQuantity,
+          sellerAddress,
+          deadline,
+          assetSymbol,
+        }}
       />
-      <AttachedFile extraDescriptionUri={extraDescriptionUri} />
+      <AttachedFile {...{ extraDescriptionUri }} />
     </Container>
   );
 };

diff --git a/web/src/components/PreviewCard/index.tsx b/web/src/components/PreviewCard/index.tsx
@@ -54,11 +54,10 @@ interface IPreviewCard {
   receivingQuantity: string;
   transactionCreationTimestamp: string;
   status: string;
-  token: string;
   buyerAddress: string;
   sendingQuantity: string;
   sellerAddress: string;
-  deadlineDate: string;
+  deadline: number;
   assetSymbol: string;
   overrideIsList: boolean;
   extraDescriptionUri: string;
@@ -80,11 +79,10 @@ const PreviewCard: React.FC<IPreviewCard> = ({
   receivingQuantity,
   transactionCreationTimestamp,
   status,
-  token,
   buyerAddress,
   sendingQuantity,
   sellerAddress,
-  deadlineDate,
+  deadline,
   assetSymbol,
   overrideIsList,
   extraDescriptionUri,
@@ -104,9 +102,8 @@ const PreviewCard: React.FC<IPreviewCard> = ({
       <Divider />
       <TransactionInfo
         amount={sendingQuantity}
-        assetSymbol={assetSymbol}
         isPreview={true}
-        {...{ overrideIsList, deadlineDate, sellerAddress, buyerAddress }}
+        {...{ overrideIsList, deadline, sellerAddress, buyerAddress, assetSymbol }}
       />
       <Divider />
     </TransactionInfoContainer>
@@ -118,7 +115,7 @@ const PreviewCard: React.FC<IPreviewCard> = ({
         buyerAddress,
         sendingQuantity,
         sellerAddress,
-        deadlineDate,
+        deadline,
         assetSymbol,
         extraDescriptionUri,
       }}

diff --git a/web/src/components/TransactionInfo/index.tsx b/web/src/components/TransactionInfo/index.tsx
@@ -71,7 +71,7 @@ const RestOfFieldsContainer = styled.div<{ isList?: boolean; isPreview?: boolean
 
 export interface ITransactionInfo {
   amount?: string;
-  deadlineDate: string;
+  deadline: number;
   assetSymbol?: string;
   status?: Statuses;
   overrideIsList?: boolean;
@@ -83,7 +83,7 @@ export interface ITransactionInfo {
 const TransactionInfo: React.FC<ITransactionInfo> = ({
   amount,
   assetSymbol,
-  deadlineDate,
+  deadline,
   sellerAddress,
   buyerAddress,
   overrideIsList,
@@ -108,11 +108,11 @@ const TransactionInfo: React.FC<ITransactionInfo> = ({
             isPreview={isPreview}
           />
         ) : null}
-        {deadlineDate ? (
+        {deadline ? (
           <Field
             icon={CalendarIcon}
             name="Delivery Deadline"
-            value={deadlineDate}
+            value={new Date(deadline).toLocaleString()}
             displayAsList={displayAsList}
             isPreview={isPreview}
           />

diff --git a/web/src/pages/MyTransactions/TransactionDetails/index.tsx b/web/src/pages/MyTransactions/TransactionDetails/index.tsx
@@ -78,7 +78,7 @@ const TransactionDetails: React.FC = () => {
           sellerAddress={seller}
           transactionCreationTimestamp={timestamp}
           sendingQuantity={!isUndefined(amount) ? formatEther(amount) : ""}
-          deadlineDate={new Date(deadline * 1000).toLocaleString()}
+          deadline={deadline * 1000}
           assetSymbol={!token ? nativeTokenSymbol : erc20TokenSymbol}
           overrideIsList={false}
           amount={!isUndefined(amount) ? formatEther(amount) : ""}

diff --git a/web/src/pages/NewTransaction/Preview/index.tsx b/web/src/pages/NewTransaction/Preview/index.tsx
@@ -37,18 +37,20 @@ const Preview: React.FC = () => {
     <Container>
       <Header />
       <PreviewCard
-        receivingQuantity={receivingQuantity}
-        sellerAddress={sellerAddress}
-        sendingQuantity={sendingQuantity}
         buyerAddress={address}
-        escrowType={escrowType}
-        deliverableText={deliverableText}
         assetSymbol={sendingToken === "native" ? nativeTokenSymbol : erc20TokenSymbol}
-        deadlineDate={new Date(deadline).toLocaleString()}
         overrideIsList={false}
-        escrowTitle={escrowTitle}
-        extraDescriptionUri={extraDescriptionUri}
         isPreview={true}
+        deadline={new Date(deadline).getTime()}
+        {...{
+          receivingQuantity,
+          sellerAddress,
+          sendingQuantity,
+          escrowType,
+          deliverableText,
+          escrowTitle,
+          extraDescriptionUri,
+        }}
       />
       <NavigationButtons prevRoute="/new-transaction/notifications" nextRoute="/new-transaction/deliverable" />
     </Container>