fixed installs

.yarnrc.yml

@@ -1,11 +1,9 @@
-enableColors: true
+yarnPath: .yarn/releases/yarn-4.1.0.cjs
 
-nmHoistingLimits: workspaces
+packageExtensions:
+  "@wagmi/core@*":
+    dependencies:
+      "@tanstack/query-core": "*"
 
-nodeLinker: node-modules
-
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
-
-yarnPath: .yarn/releases/yarn-3.2.3.cjs
+pnpMode: loose
+pnpFallbackMode: dependencies-only

package.json

@@ -30,7 +30,7 @@
     "vercel": "yarn workspace @se-2/nextjs vercel",
     "vercel:yolo": "yarn workspace @se-2/nextjs vercel:yolo"
   },
-  "packageManager": "yarn@3.2.3",
+  "packageManager": "yarn@4.1.0",
   "devDependencies": {
     "husky": "^8.0.1",
     "lint-staged": "^13.0.3"

packages/hardhat/deploy/00_deploy_your_contract.ts

@@ -3,7 +3,7 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { Contract } from "ethers";
 
 /**
- * Deploys a contract named "YourContract" using the deployer account and
+ * Deploys a contract named "TokenFactory" using the deployer account and
  * constructor arguments set to the deployer address
  *
  * @param hre HardhatRuntimeEnvironment object.
@@ -22,7 +22,7 @@ const deployYourContract: DeployFunction = async function (hre: HardhatRuntimeEn
   const { deployer } = await hre.getNamedAccounts();
   const { deploy } = hre.deployments;
 
-  await deploy("YourContract", {
+  await deploy("TokenFactory", {
     from: deployer,
     // Contract constructor arguments
     args: [deployer],
@@ -33,12 +33,26 @@ const deployYourContract: DeployFunction = async function (hre: HardhatRuntimeEn
   });
 
   // Get the deployed contract to interact with it after deploying.
-  const yourContract = await hre.ethers.getContract<Contract>("YourContract", deployer);
-  console.log("👋 Initial greeting:", await yourContract.greeting());
+  const tokenShopFactory = await hre.ethers.getContract<Contract>("TokenFactory", deployer);
+
+  console.log("owner:", await tokenShopFactory.owner());
+
+  // await tokenShopFactory.createToken(
+  //   "BufficornCastle",
+  //   "BCC",
+  //   "500000",
+  //   "1000000000000000000",
+  //   1709420650,
+  //   "15000000000000000000",
+  //   "10000000000000000000",
+  //   "20000000000000000000",
+  //   "https://daisyui.com/images/stock/photo-1606107557195-0e29a4b5b4aa.jpg",
+  //   "15000000000000000000",
+  // );
 };
 
 export default deployYourContract;
 
 // Tags are useful if you have multiple deploy files and only want to run one of them.
-// e.g. yarn deploy --tags YourContract
-deployYourContract.tags = ["YourContract"];
+// e.g. yarn deploy --tags TokenFactory
+deployYourContract.tags = ["TokenFactory"];

packages/nextjs/.eslintrc.json

@@ -11,5 +11,8 @@
         "endOfLine": "auto"
       }
     ]
+  },
+  "globals":{
+    "BigInt": true
   }
 }

packages/nextjs/.npmrc

@@ -1 +1 @@
-strict-peer-dependencies = false
+strict-peer-dependencies = true

packages/nextjs/app/investment/[id]/page.tsx

@@ -3,13 +3,15 @@
 import React, { useCallback, useState } from "react";
 import { useParams } from "next/navigation";
 import { mainnet, sepolia } from "@wagmi/core/chains";
+import { write } from "fs";
 import type { NextPage } from "next";
-import { useAccount, useSwitchChain, useWalletClient } from "wagmi";
-import { mockInvestments } from "~~/services/mockInvestment";
+import { useAccount, useSwitchChain, useWalletClient, useWriteContract } from "wagmi";
 import EtherIcon from "~~/components/EtherIcon";
 // for development only
 import Banner from "~~/components/InvestmentDetailsBanner";
 import { RainbowKitCustomConnectButton } from "~~/components/scaffold-eth/RainbowKitCustomConnectButton";
+import TokenAbi from "~~/contracts/TokenShop";
+import { mockInvestments } from "~~/services/mockInvestment";
 
 const validAmountRegex = /^[0-9]{0,78}\.?[0-9]{0,18}$/;
 
@@ -32,7 +34,8 @@ const InvestmentDetails: NextPage = () => {
   // query for investment details
   const investment = mockInvestments[0];
 
-  const { isConnected, chain: currentChain } = useAccount();
+  const { data: hash, writeContract } = useWriteContract();
+  const { isConnected, chain: currentChain, address: connectedAddress } = useAccount();
   // console.log("account:", account);
   const walletClient = useWalletClient();
   // console.log("walletClient:", walletClient);
@@ -63,6 +66,27 @@ const InvestmentDetails: NextPage = () => {
     },
     [setAmount],
   );
+
+  const handleBuy = async () => {
+    // const txn = await writeContract({
+    //   address: connectedAddress as `0x${string}`,
+    //   abi:
+    // });
+    // console.log("txn:", txn);
+    console.log("handleBuy");
+  };
+
+  const handleSell = () => {
+    console.log("handleSell");
+  };
+
+  const handleClick = useCallback(
+    async (e: React.ChangeEvent<HTMLInputElement>) => {
+      return activeTab === Tabs.Buy ? handleBuy() : handleSell();
+    },
+    [activeTab],
+  );
+
   return (
     <>
       <Banner investment={investment} />
@@ -127,7 +151,9 @@ const InvestmentDetails: NextPage = () => {
               </div>
 
               {isConnected && currentChain && currentChain.id === chain.id ? (
-                <button className="btn btn-primary">Buy Now</button>
+                <button className="btn btn-primary" onClick={handleClick}>
+                  {activeTab === Tabs.Buy ? "Buy Now" : "Redeem"}
+                </button>
               ) : isConnected && currentChain?.id !== chain.id ? (
                 <button className="btn btn-primary btn-error" onClick={() => switchChain({ chainId: chain.id })}>
                   Switch Network