Merge pull request #108 from VoiceDeck/op

baumstern · web-flow · commit 8ab532aa6934 · 2024-10-18T09:02:50.000+02:00
OP Mainnet
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -11,7 +11,6 @@ import { siteConfig } from "@/config/site";
 import { config } from "@/config/wagmi";
 import { WagmiContextProvider } from "@/contexts/wagmi";
 import { headers } from "next/headers";
-import Script from "next/script";
 
 export const metadata: Metadata = {
 	metadataBase: new URL("https://app.voicedeck.org/"),
@@ -57,26 +56,6 @@ export default function RootLayout({
 					<div className="flex-1">{children}</div>
 					<Footer />
 				</WagmiContextProvider>
-				<Script
-					id="matomo-tracking"
-					strategy="afterInteractive"
-					// biome-ignore lint/security/noDangerouslySetInnerHtml: <explanation>
-					dangerouslySetInnerHTML={{
-						__html: `
-							var _paq = window._paq = window._paq || [];
-							_paq.push(['trackPageView']);
-							_paq.push(['enableLinkTracking']);
-							(function() {
-								var u="https://psedev.matomo.cloud/";
-								_paq.push(['setTrackerUrl', u+'matomo.php']);
-								_paq.push(['setSiteId', '13']);
-								var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-								g.async=true; g.src='https://cdn.matomo.cloud/psedev.matomo.cloud/matomo.js';
-								s.parentNode.insertBefore(g,s);
-							})();
-						`,
-					}}
-				/>
 			</body>
 		</html>
 	);
diff --git a/components/report-details/report-sidebar.tsx b/components/report-details/report-sidebar.tsx
@@ -13,13 +13,13 @@ const ImpactDetails = ({ report }: { report: Report }) => {
 		{
 			title: "Impact Timeframe",
 			value: report.impactTimeframe
-				? new Date(report.impactTimeframe).toLocaleDateString()
+				? report.impactTimeframe
 				: "N/A",
 		},
 		{
 			title: "Work Timeframe",
 			value: report.workTimeframe
-				? new Date(report.workTimeframe).toLocaleDateString()
+				? report.workTimeframe
 				: "N/A",
 		},
 		{
diff --git a/config/wagmi.ts b/config/wagmi.ts
@@ -2,7 +2,7 @@ import { defaultWagmiConfig } from "@web3modal/wagmi/react/config";
 
 import { cookieStorage, createStorage } from "wagmi";
 import { getVoiceDeckUrl } from "./endpoint";
-import { sepolia } from "viem/chains";
+import { optimism } from "viem/chains";
 
 // Get projectId at https://cloud.walletconnect.com
 export const projectId = process.env.NEXT_PUBLIC_WC_PROJECT_ID;
@@ -19,7 +19,7 @@ const metadata = {
 
 // Create wagmiConfig
 export const config = defaultWagmiConfig({
-  chains: [sepolia], // required
+  chains: [optimism], // required
   projectId, // required
   metadata, // required
   ssr: true,
diff --git a/contexts/wagmi.tsx b/contexts/wagmi.tsx
@@ -8,7 +8,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
 import { config, projectId } from "@/config/wagmi";
 import { type State, WagmiProvider } from "wagmi";
-import { sepolia } from "viem/chains";
+import { optimism } from "viem/chains";
 
 // Setup queryClient
 const queryClient = new QueryClient();
@@ -19,7 +19,7 @@ if (!projectId) throw new Error("Project ID is not defined");
 createWeb3Modal({
 	wagmiConfig: config,
 	projectId,
-	defaultChain: sepolia,
+	defaultChain: optimism,
 	enableAnalytics: true, // Optional - defaults to your Cloud configuration
 });
 
diff --git a/hooks/use-buy-fraction.ts b/hooks/use-buy-fraction.ts
@@ -47,6 +47,16 @@ const useHandleBuyFraction = (
       order.price
     );
 
+    try {
+    const approveTx = await hypercertExhangeClient.approveErc20(order.currency, BigInt(order.price) * amount);
+
+    await waitForTransactionReceipt(publicClient, {
+      hash: approveTx.hash as `0x${string}`,
+    });
+  } catch (e) {
+    console.error("faiiled to approve tx: " + e);
+  }
+
     try {
       setTransactionStatus("PreparingOrder");
       const { call } = hypercertExhangeClient.executeOrder(
diff --git a/hooks/use-get-current-erc20-allowance.ts b/hooks/use-get-current-erc20-allowance.ts
@@ -5,13 +5,13 @@ import {
   addressesByNetwork,
   utils,
 } from "@hypercerts-org/marketplace-sdk";
-import { sepolia } from "viem/chains";
+import { optimism } from "viem/chains";
 import { useAccount, useReadContract } from "wagmi";
 
 export const useGetCurrentERC20Allowance = () => {
   const { chainId, address } = useAccount();
   const hypercertsExchangeAddress =
-    deployments[asDeployedChain(chainId ?? sepolia.id)].HypercertExchange;
+    deployments[asDeployedChain(chainId ?? optimism.id)].HypercertExchange;
   // TODO: FIX IT
   const wethAddress = "FILL_ME";
   const { data } = useReadContract({
diff --git a/hooks/use-support-form.ts b/hooks/use-support-form.ts
@@ -54,6 +54,7 @@ const useSupportForm = (
       throw new Error("No address found");
     }
 
+    console.log("amount to buy: ", BigInt(Math.trunc(unitsToBuy)));
     await handleBuyFraction(
       order,
       BigInt(Math.trunc(unitsToBuy)),
diff --git a/lib/directus.ts b/lib/directus.ts
@@ -21,7 +21,7 @@ import {
   createPublicClient,
   getAddress,
 } from "viem";
-import { sepolia } from "viem/chains";
+import { optimism } from "viem/chains";
 
 import type { CMSContent, Contribution } from "@/types";
 import { updateFundedAmount } from "./impact-reports";
@@ -432,7 +432,7 @@ export const getViemClient = (): PublicClient => {
   }
   
   viemClient = createPublicClient({
-    chain: sepolia,
+    chain: optimism,
     transport: http(process.env.JSON_RPC_ENDPOINT ? process.env.JSON_RPC_ENDPOINT : undefined),
   });
 
diff --git a/lib/impact-reports.ts b/lib/impact-reports.ts
@@ -53,7 +53,7 @@ export const fetchReports = async (): Promise<Report[]> => {
           `[Hypercerts] Failed to fetch claims owned by ${ownerAddress}`,
         );
       }
-      console.log("hypercertsRes", hypercertsRes.data);
+      // console.log("hypercertsRes", hypercertsRes.data);
       claims = hypercertsRes.data;
 
       const _reports = await updateReports();
@@ -164,7 +164,7 @@ export const getHypercertClient = (): HypercertClient => {
     return hypercertClient;
   }
 
-  hypercertClient = new HypercertClient({ environment: "test" }); // Sepolia testnet
+  hypercertClient = new HypercertClient({ environment: "production" }); // Optimism
 
   return hypercertClient;
 };
@@ -279,9 +279,9 @@ const updateReports = async (): Promise<Report[]> => {
         image: "https://directus.voicedeck.org/assets/" + cmsReport.image,
         originalReportUrl: claim?.metadata?.external_url,
         category: claim?.metadata?.work_scope?.[0],
-        workTimeframe: `${claim.metadata?.work_timeframe_from} - ${claim.metadata?.work_timeframe_to}`,
+        workTimeframe: `${(new Date(Number(claim.metadata?.work_timeframe_from) * 1000)).toLocaleDateString()} - ${(new Date(Number(claim.metadata?.work_timeframe_to) * 1000)).toLocaleDateString()}`,
         impactScope: claim?.metadata?.impact_scope?.[0],
-        impactTimeframe: `${claim?.metadata?.impact_timeframe_from} - ${claim?.metadata?.impact_timeframe_to}`,
+        impactTimeframe: `${new Date(Number(claim.metadata?.impact_timeframe_from) * 1000).toLocaleDateString()} - ${(new Date(Number(claim.metadata?.impact_timeframe_to) * 1000).toLocaleDateString())}`,
         contributors: claim?.metadata?.contributors?.map(
           (name: string) => name,
         ),
diff --git a/lib/marketplace.ts b/lib/marketplace.ts
@@ -2,7 +2,7 @@ import "server-only";
 
 import { HypercertExchangeClient } from "@hypercerts-org/marketplace-sdk";
 import { ethers } from "ethers";
-import { sepolia } from "viem/chains";
+import { optimism } from "viem/chains";
 
 import type { Order, Report } from "@/types";
 
@@ -101,7 +101,7 @@ export const getHypercertExchangeClient = (): HypercertExchangeClient => {
   }
 
   hypercertExchangeClient = new HypercertExchangeClient(
-    sepolia.id,
+    optimism.id,
     provider,
     signer,
   );

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,13 @@ const ImpactDetails = ({ report }: { report: Report }) => {`
`13`	`13`	`{`
`14`	`14`	`title: "Impact Timeframe",`
`15`	`15`	`value: report.impactTimeframe`
`16`		`- ? new Date(report.impactTimeframe).toLocaleDateString()`
	`16`	`+ ? report.impactTimeframe`
`17`	`17`	`: "N/A",`
`18`	`18`	`},`
`19`	`19`	`{`
`20`	`20`	`title: "Work Timeframe",`
`21`	`21`	`value: report.workTimeframe`
`22`		`- ? new Date(report.workTimeframe).toLocaleDateString()`
	`22`	`+ ? report.workTimeframe`
`23`	`23`	`: "N/A",`
`24`	`24`	`},`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ const useSupportForm = (`
`54`	`54`	`throw new Error("No address found");`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ console.log("amount to buy: ", BigInt(Math.trunc(unitsToBuy)));`
`57`	`58`	`await handleBuyFraction(`
`58`	`59`	`order,`
`59`	`60`	`BigInt(Math.trunc(unitsToBuy)),`