Cluster time fix (#166)

* provides alternative to clustertime

* provides system timestamp when blocktime null

* moves comment to relevant place

* removes redundant finally

src/client/api.ts

@@ -138,7 +138,19 @@ export const getGatekeeperNetwork = multiAsync(
 
 export const getClusterTime = multiAsync(async (connection: Connection) => {
 	const slot = await connection.getSlot();
-	return connection.getBlockTime(slot);
+	return (
+		connection
+			.getBlockTime(slot)
+			.then((blockTime) => {
+				if (!blockTime) {
+					throw Error("Could not fetch cluster time");
+				}
+
+				return blockTime;
+			})
+			// * 1000 because now() returns milliseconds
+			.catch(() => Date.now() * 1000)
+	);
 });
 
 const getWeightedAverageFinancingFee = multiAsync(
@@ -149,10 +161,6 @@ const getWeightedAverageFinancingFee = multiAsync(
 
 		const [deals, clusterTime] = await Promise.all([_deals, _clusterTime]);
 
-		if (!clusterTime) {
-			throw Error("Could not fetch cluster time");
-		}
-
 		const runningFinancingFee = deals.reduce((result, deal) => {
 			const status = mapDealToStatus(deal.account, clusterTime);
 			if (status === DealStatus.IN_PROGRESS) {

src/react/components/DealOverview.tsx

@@ -71,11 +71,6 @@ export const DealOverview = () => {
 
 		setDeal(deal);
 
-		if (!clusterTime) {
-			// TODO: DO SOMETHING
-			throw Error("Could not fetch cluster time");
-		}
-
 		const dealStatus = mapDealToStatus(deal, clusterTime);
 		setDealStatus(dealStatus);
 

src/react/components/DealsTable.tsx

@@ -25,7 +25,7 @@ export const DealsTable = (props: Props) => {
 	const wallet = useAnchorWallet();
 	const connection = useConnection();
 	const [deals, setDeals] = useState<any>([]);
-	const [clusterTime, setClusterTime] = useState<number | null>(null);
+	const [clusterTime, setClusterTime] = useState<number>(Date.now() * 1000);
 	const navigate = useNavigate();
 	const marketSeed = useMarketSeed();
 
@@ -62,9 +62,8 @@ export const DealsTable = (props: Props) => {
 				? new Date(deal.goLiveAt.mul(new BN(1000)).toNumber())
 				: undefined;
 
-		const dealStatus = clusterTime && mapDealToStatus(deal, clusterTime);
-		const daysRemaining =
-			dealStatus && clusterTime && getDaysRemaining(deal, clusterTime, dealStatus);
+		const dealStatus = mapDealToStatus(deal, clusterTime);
+		const daysRemaining = getDaysRemaining(deal, clusterTime, dealStatus);
 
 		const targetRoute = Path.DEALS_DETAIL.replace(":borrower", deal.borrower.toString()).replace(
 			":deal",
@@ -105,7 +104,7 @@ export const DealsTable = (props: Props) => {
 					)}
 				</TableCell>
 				<TableCell>{`${daysRemaining} / ${deal.timeToMaturityDays}`}</TableCell>
-				<TableCell>{`${dealStatus !== null && formatDealStatus(dealStatus)}`}</TableCell>
+				<TableCell>{`${formatDealStatus(dealStatus)}`}</TableCell>
 				<TableCell>{showRepayButton && <CredixButton text="repay" />}</TableCell>
 			</TableRow>
 		);