From 6b1ead7b8dd1efe2841f6c7bad529ff3e2e2afbf Mon Sep 17 00:00:00 2001
From: Ruven Salamon <ruven.salamon@gmail.com>
Date: Wed, 8 Dec 2021 21:22:37 +0100
Subject: [PATCH 1/7] rounding fix + deal repayment form improvements

---
 src/react/components/DealOverview.tsx         | 46 +++++++++++++------
 src/react/components/forms/CreateDealForm.tsx | 11 ++++-
 src/utils/format.utils.ts                     |  2 +-
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/react/components/DealOverview.tsx b/src/react/components/DealOverview.tsx
index 2eef1d6..eaab631 100644
--- a/src/react/components/DealOverview.tsx
+++ b/src/react/components/DealOverview.tsx
@@ -7,7 +7,7 @@ import React, { useCallback, useEffect, useState } from "react";
 import { useNotify } from "react/hooks/useNotify";
 import { useRefresh } from "react/hooks/useRefresh";
 import { getClusterTime, getDealAccountData, repayDeal } from "store/api";
-import { Deal, DealStatus, RepaymentType } from "types/program.types";
+import { Deal, DealStatus } from "types/program.types";
 import {
 	createInterestRepaymentType,
 	createPrincipalRepaymentType,
@@ -18,7 +18,6 @@ import {
 import { toUIAmount, toUIPercentage } from "utils/format.utils";
 import "../../styles/stakeform.scss";
 
-// TODO: store deal in state instead of every property separately
 export const DealOverview = () => {
 	const wallet = useAnchorWallet();
 	const [placeholder, setPlaceholder] = useState<string>("Connect wallet");
@@ -26,10 +25,8 @@ export const DealOverview = () => {
 	const [deal, setDeal] = useState<Deal | undefined>();
 	const [dealStatus, setDealStatus] = useState<DealStatus | undefined>();
 	const [repaymentAmount, setRepaymentAmount] = useState<number | undefined>();
-	const [repaymentType, setRepaymentType] = useState<RepaymentType>(createInterestRepaymentType());
-	const [repaymentSelectValue, setRepaymentSelectValue] = useState<string>("interest");
+	const [repaymentSelectValue, setRepaymentSelectValue] = useState<string>("principal");
 	const notify = useNotify();
-	const triggerRefresh = useRefresh();
 
 	const fetchDealData = useCallback(async () => {
 		const _clusterTime = getClusterTime(connection.connection);
@@ -48,6 +45,20 @@ export const DealOverview = () => {
 		setDealStatus(dealStatus);
 	}, [connection.connection, wallet]);
 
+	const triggerRefresh = useRefresh(fetchDealData);
+
+	const determineRepaymentType = useCallback(() => {
+		if (!deal) {
+			return;
+		}
+
+		const interestToRepay = getInterestToRepay(deal);
+
+		setRepaymentSelectValue(
+			repaymentSelectValue === "interest" && interestToRepay ? "interest" : "principal"
+		);
+	}, [deal, repaymentSelectValue]);
+
 	const calculateRepaymentAmount = useCallback(() => {
 		if (!deal) {
 			setRepaymentAmount(0);
@@ -80,6 +91,10 @@ export const DealOverview = () => {
 		calculateRepaymentAmount();
 	}, [calculateRepaymentAmount]);
 
+	useEffect(() => {
+		determineRepaymentType();
+	}, [determineRepaymentType]);
+
 	const onSubmit = async (e: React.SyntheticEvent) => {
 		e.preventDefault();
 
@@ -88,7 +103,11 @@ export const DealOverview = () => {
 		}
 
 		try {
-			await repayDeal(repaymentAmount, repaymentType, connection.connection, wallet as Wallet);
+			const repaymentTypeObj =
+				repaymentSelectValue === "interest"
+					? createInterestRepaymentType()
+					: createPrincipalRepaymentType();
+			await repayDeal(repaymentAmount, repaymentTypeObj, connection.connection, wallet as Wallet);
 			const showFeeNotification = repaymentSelectValue === "interest";
 			const paymentNotification = `Successfully repaid ${toUIAmount(repaymentAmount)} USDC`;
 			const feeNotification = ` with a ${toUIAmount(
@@ -108,13 +127,6 @@ export const DealOverview = () => {
 
 	const onRepaymentTypeChange = (e: any) => {
 		if (repaymentSelectValue !== e.target.value) {
-			switch (e.target.value) {
-				case "interest":
-					setRepaymentType(createInterestRepaymentType());
-					break;
-				default:
-					setRepaymentType(createPrincipalRepaymentType());
-			}
 			setRepaymentSelectValue(e.target.value);
 		}
 	};
@@ -173,8 +185,12 @@ export const DealOverview = () => {
 						value={repaymentSelectValue}
 						className="repayment-select credix-button MuiButton-root"
 					>
-						<MenuItem value="principal">Principal</MenuItem>
-						<MenuItem value="interest">Interest</MenuItem>
+						<MenuItem value="principal" disabled={!deal || !getPrincipalToRepay(deal)}>
+							Principal
+						</MenuItem>
+						<MenuItem value="interest" disabled={!deal || !getInterestToRepay(deal)}>
+							Interest
+						</MenuItem>
 					</Select>
 				</label>
 				<br />
diff --git a/src/react/components/forms/CreateDealForm.tsx b/src/react/components/forms/CreateDealForm.tsx
index 35ec1d4..5b4628f 100644
--- a/src/react/components/forms/CreateDealForm.tsx
+++ b/src/react/components/forms/CreateDealForm.tsx
@@ -96,7 +96,14 @@ export const CreateDealForm = (props: Props) => {
 		}
 
 		return (
-			wallet?.publicKey && principal && financingFee && borrower && validKey && !props.disabled
+			wallet?.publicKey &&
+			principal &&
+			financingFee &&
+			borrower &&
+			validKey &&
+			!props.disabled &&
+			timeToMaturity &&
+			!(timeToMaturity % 30)
 		);
 	};
 
@@ -161,7 +168,7 @@ export const CreateDealForm = (props: Props) => {
 				</label>
 				<br />
 				<label className="stake-input-label">
-					Financing fee
+					Financing fee %
 					<input
 						name="financingFee"
 						type="number"
diff --git a/src/utils/format.utils.ts b/src/utils/format.utils.ts
index 332fa2f..9cff565 100644
--- a/src/utils/format.utils.ts
+++ b/src/utils/format.utils.ts
@@ -13,5 +13,5 @@ export const toProgramAmount = (n: number) => n * Math.pow(10, DECIMALS);
 export const toProgramPercentage = (n: number) => n * PERCENTAGE_FACTOR;
 export const toAppPercentage = (n: number) => round(n / PERCENTAGE_FACTOR);
 
-export const toUIAmount = (n: number) => round(toAppAmount(n));
+export const toUIAmount = (n: number) => round(Math.floor(toAppAmount(n) * 100) / 100);
 export const toUIPercentage = (n: number) => round(toAppPercentage(n));

From ee4a56b7027db9e34527a502198437aa1329b17a Mon Sep 17 00:00:00 2001
From: ceunen <bouwe@ceunen.io>
Date: Thu, 9 Dec 2021 15:12:13 +0100
Subject: [PATCH 2/7] set default repayment value interest

---
 src/react/components/DealOverview.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/react/components/DealOverview.tsx b/src/react/components/DealOverview.tsx
index eaab631..8537db5 100644
--- a/src/react/components/DealOverview.tsx
+++ b/src/react/components/DealOverview.tsx
@@ -25,7 +25,7 @@ export const DealOverview = () => {
 	const [deal, setDeal] = useState<Deal | undefined>();
 	const [dealStatus, setDealStatus] = useState<DealStatus | undefined>();
 	const [repaymentAmount, setRepaymentAmount] = useState<number | undefined>();
-	const [repaymentSelectValue, setRepaymentSelectValue] = useState<string>("principal");
+	const [repaymentSelectValue, setRepaymentSelectValue] = useState<string>("interest");
 	const notify = useNotify();
 
 	const fetchDealData = useCallback(async () => {

From e17d611e6598c7c9da00158f74c7366fcaf4e9eb Mon Sep 17 00:00:00 2001
From: Maxim Piessen <maximpiessen@Maxims-MacBook-Pro.local>
Date: Thu, 9 Dec 2021 18:51:47 +0100
Subject: [PATCH 3/7] add option to repay partly, show some more info

---
 src/react/components/DealOverview.tsx         | 45 +++++++++++++------
 src/react/components/forms/CreateDealForm.tsx |  3 ++
 src/styles/depositstakeform.scss              |  6 ++-
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/react/components/DealOverview.tsx b/src/react/components/DealOverview.tsx
index 8537db5..b9865c2 100644
--- a/src/react/components/DealOverview.tsx
+++ b/src/react/components/DealOverview.tsx
@@ -15,7 +15,7 @@ import {
 	getPrincipalToRepay,
 	mapDealToStatus,
 } from "utils/deal.utils";
-import { toUIAmount, toUIPercentage } from "utils/format.utils";
+import { toUIAmount, toUIPercentage, toProgramAmount } from "utils/format.utils";
 import "../../styles/stakeform.scss";
 
 export const DealOverview = () => {
@@ -24,7 +24,8 @@ export const DealOverview = () => {
 	const connection = useConnection();
 	const [deal, setDeal] = useState<Deal | undefined>();
 	const [dealStatus, setDealStatus] = useState<DealStatus | undefined>();
-	const [repaymentAmount, setRepaymentAmount] = useState<number | undefined>();
+	const [amountToRepay, setAmountToRepay] = useState<number | undefined>();	
+	const [repaymentAmount, setRepaymentAmount] = useState<number | undefined>(0);
 	const [repaymentSelectValue, setRepaymentSelectValue] = useState<string>("interest");
 	const notify = useNotify();
 
@@ -59,19 +60,17 @@ export const DealOverview = () => {
 		);
 	}, [deal, repaymentSelectValue]);
 
-	const calculateRepaymentAmount = useCallback(() => {
+	const calculateAmountToRepay = useCallback(() => {
 		if (!deal) {
-			setRepaymentAmount(0);
 			return;
 		}
-
 		switch (repaymentSelectValue) {
 			case "interest": {
-				setRepaymentAmount(getInterestToRepay(deal));
+				setAmountToRepay(getInterestToRepay(deal));
 				break;
 			}
 			default:
-				setRepaymentAmount(getPrincipalToRepay(deal));
+				setAmountToRepay(getPrincipalToRepay(deal));
 		}
 	}, [repaymentSelectValue, deal]);
 
@@ -88,8 +87,8 @@ export const DealOverview = () => {
 	}, [connection.connection, wallet?.publicKey, fetchDealData]);
 
 	useEffect(() => {
-		calculateRepaymentAmount();
-	}, [calculateRepaymentAmount]);
+		calculateAmountToRepay();
+	}, [calculateAmountToRepay]);
 
 	useEffect(() => {
 		determineRepaymentType();
@@ -98,22 +97,24 @@ export const DealOverview = () => {
 	const onSubmit = async (e: React.SyntheticEvent) => {
 		e.preventDefault();
 
-		if (!repaymentAmount) {
+		if (!repaymentAmount || !amountToRepay) {
 			return;
 		}
 
 		try {
+			calculateAmountToRepay();
 			const repaymentTypeObj =
 				repaymentSelectValue === "interest"
 					? createInterestRepaymentType()
 					: createPrincipalRepaymentType();
 			await repayDeal(repaymentAmount, repaymentTypeObj, connection.connection, wallet as Wallet);
 			const showFeeNotification = repaymentSelectValue === "interest";
-			const paymentNotification = `Successfully repaid ${toUIAmount(repaymentAmount)} USDC`;
+			const paymentNotification = `Successfully repaid ${toUIAmount(Math.min(repaymentAmount, amountToRepay))} USDC`;
 			const feeNotification = ` with a ${toUIAmount(
-				repaymentAmount * FEES.INTEREST_PAYMENT
+				Math.min(repaymentAmount, amountToRepay) * FEES.INTEREST_PAYMENT
 			)} USDC fee`;
 			notify("success", `${paymentNotification}${showFeeNotification ? feeNotification : ""}`);
+			setRepaymentAmount(0);
 			triggerRefresh();
 		} catch (e: any) {
 			notify("error", `Transaction failed! ${e?.message}`);
@@ -128,9 +129,23 @@ export const DealOverview = () => {
 	const onRepaymentTypeChange = (e: any) => {
 		if (repaymentSelectValue !== e.target.value) {
 			setRepaymentSelectValue(e.target.value);
+			setRepaymentAmount(0);
 		}
 	};
 
+	const onChange = (
+		e: React.ChangeEvent<HTMLInputElement>,
+		setter: (val: number | undefined) => any
+	) => {
+		const newValue = e.target.value === "" ? undefined : toProgramAmount(Number(e.target.value));
+		console.log(newValue);
+		setter(newValue);
+	};
+
+	const onChangeRepaymentAmount = (e: React.ChangeEvent<HTMLInputElement>) => {
+		onChange(e, setRepaymentAmount);
+	};
+
 	return (
 		<div>
 			<h2>Your deal</h2>
@@ -150,6 +165,7 @@ export const DealOverview = () => {
 				<br />
 				<label className="stake-input-label">
 					Principal
+					<p>The total amount of USDC to borrow</p>
 					<input
 						name="principal"
 						type="number"
@@ -163,6 +179,7 @@ export const DealOverview = () => {
 				<br />
 				<label className="stake-input-label">
 					Financing Fee %
+					<p>The percentage on top of the principal that needs to be repaid as interest</p> 
 					<input
 						name="financingFee"
 						type="number"
@@ -196,12 +213,12 @@ export const DealOverview = () => {
 				<br />
 				<label className="stake-input-label">
 					USDC amount
+					<p>To repay: {amountToRepay === undefined ? "" : toUIAmount(amountToRepay)} USDC</p>
 					<input
 						name="repayment"
 						type="number"
-						disabled={!canSubmit()}
-						readOnly={true}
 						placeholder={placeholder}
+						onChange={onChangeRepaymentAmount}
 						value={repaymentAmount === undefined ? "" : toUIAmount(repaymentAmount)}
 						className="stake-input credix-button MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary balance-button"
 					/>
diff --git a/src/react/components/forms/CreateDealForm.tsx b/src/react/components/forms/CreateDealForm.tsx
index 5b4628f..5dd3c7d 100644
--- a/src/react/components/forms/CreateDealForm.tsx
+++ b/src/react/components/forms/CreateDealForm.tsx
@@ -156,6 +156,7 @@ export const CreateDealForm = (props: Props) => {
 				<br />
 				<label className="stake-input-label">
 					Principal
+					<p>The total amount of USDC to borrow</p>
 					<input
 						name="principal"
 						type="number"
@@ -169,6 +170,7 @@ export const CreateDealForm = (props: Props) => {
 				<br />
 				<label className="stake-input-label">
 					Financing fee %
+					<p>The percentage on top of the principal that needs to be repaid as interest</p> 
 					<input
 						name="financingFee"
 						type="number"
@@ -182,6 +184,7 @@ export const CreateDealForm = (props: Props) => {
 				<br />
 				<label className="stake-input-label">
 					Time to maturity (days)
+					<p>How many days before you have to pay back the principal</p>
 					<input
 						name="timeToMaturity"
 						type="number"
diff --git a/src/styles/depositstakeform.scss b/src/styles/depositstakeform.scss
index c34cfe5..825bca2 100644
--- a/src/styles/depositstakeform.scss
+++ b/src/styles/depositstakeform.scss
@@ -1,6 +1,10 @@
 .stake-input-label {
 	flex-grow: 2;
 	margin-right: 10px;
+
+	p {
+		font-size: 12px; 
+	}
 }
 
 .stake-input {
@@ -34,7 +38,7 @@
 .stake-form-column {
 	flex-direction: column;
 	align-items: flex-start;
-	width: 300px;
+	width: 600px;
 	border: 1px solid black;
 	padding: 30px;
 	margin-top: 0;

From 26602ae68bf08225dbdce132b66bfac495b0b76f Mon Sep 17 00:00:00 2001
From: Maxim Piessen <maximpiessen@Maxims-MacBook-Pro.local>
Date: Thu, 9 Dec 2021 20:09:40 +0100
Subject: [PATCH 4/7] cap placeholder connect wallet

---
 src/react/components/DealOverview.tsx         | 2 +-
 src/react/components/forms/CreateDealForm.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/react/components/DealOverview.tsx b/src/react/components/DealOverview.tsx
index b9865c2..8fe587b 100644
--- a/src/react/components/DealOverview.tsx
+++ b/src/react/components/DealOverview.tsx
@@ -20,7 +20,7 @@ import "../../styles/stakeform.scss";
 
 export const DealOverview = () => {
 	const wallet = useAnchorWallet();
-	const [placeholder, setPlaceholder] = useState<string>("Connect wallet");
+	const [placeholder, setPlaceholder] = useState<string>("CONNECT WALLET");
 	const connection = useConnection();
 	const [deal, setDeal] = useState<Deal | undefined>();
 	const [dealStatus, setDealStatus] = useState<DealStatus | undefined>();
diff --git a/src/react/components/forms/CreateDealForm.tsx b/src/react/components/forms/CreateDealForm.tsx
index 5dd3c7d..9a3bf4c 100644
--- a/src/react/components/forms/CreateDealForm.tsx
+++ b/src/react/components/forms/CreateDealForm.tsx
@@ -19,7 +19,7 @@ export const CreateDealForm = (props: Props) => {
 	const [financingFee, setFinancingFee] = useState<number | undefined>();
 	const [timeToMaturity, setTimeToMaturity] = useState<number | undefined>();
 	const [borrower, setBorrower] = useState<string>("");
-	const [placeholder, setPlaceholder] = useState<string>("Connect wallet");
+	const [placeholder, setPlaceholder] = useState<string>("CONNECT WALLET");
 	const notify = useNotify();
 	const triggerRefresh = useRefresh();
 

From 31f3ecb0f988e46df73d58f03c273afb5a6f3da5 Mon Sep 17 00:00:00 2001
From: Maxim Piessen <maximpiessen@Maxims-MacBook-Pro.local>
Date: Thu, 9 Dec 2021 20:12:13 +0100
Subject: [PATCH 5/7] change footer

---
 src/react/components/Footer.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/react/components/Footer.tsx b/src/react/components/Footer.tsx
index 23ec76c..e8c940d 100644
--- a/src/react/components/Footer.tsx
+++ b/src/react/components/Footer.tsx
@@ -6,8 +6,8 @@ import "../../styles/footer.scss";
 export const Footer = () => (
 	<div>
 		<div className="footer footer-left">
-			<Link to={Path.OVERVIEW}>Pool</Link>
-			<Link to={Path.DEALS}>Deals</Link>
+			<Link to={Path.OVERVIEW}>Invest</Link>
+			<Link to={Path.DEALS}>Borrow/Repay</Link>
 			<Link to={Path.HELP} className="start-here animated bounce">
 				Start here
 			</Link>

From bcca96ccba96e1435ea1a5c5e827648b767d3b76 Mon Sep 17 00:00:00 2001
From: Maxim Piessen <maximpiessen@Maxims-MacBook-Pro.local>
Date: Fri, 10 Dec 2021 12:11:05 +0100
Subject: [PATCH 6/7] delete value in repayment

---
 src/react/components/DealOverview.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/react/components/DealOverview.tsx b/src/react/components/DealOverview.tsx
index 8fe587b..6f83647 100644
--- a/src/react/components/DealOverview.tsx
+++ b/src/react/components/DealOverview.tsx
@@ -25,7 +25,7 @@ export const DealOverview = () => {
 	const [deal, setDeal] = useState<Deal | undefined>();
 	const [dealStatus, setDealStatus] = useState<DealStatus | undefined>();
 	const [amountToRepay, setAmountToRepay] = useState<number | undefined>();	
-	const [repaymentAmount, setRepaymentAmount] = useState<number | undefined>(0);
+	const [repaymentAmount, setRepaymentAmount] = useState<number | undefined>();
 	const [repaymentSelectValue, setRepaymentSelectValue] = useState<string>("interest");
 	const notify = useNotify();
 
@@ -114,7 +114,7 @@ export const DealOverview = () => {
 				Math.min(repaymentAmount, amountToRepay) * FEES.INTEREST_PAYMENT
 			)} USDC fee`;
 			notify("success", `${paymentNotification}${showFeeNotification ? feeNotification : ""}`);
-			setRepaymentAmount(0);
+			setRepaymentAmount(undefined);
 			triggerRefresh();
 		} catch (e: any) {
 			notify("error", `Transaction failed! ${e?.message}`);
@@ -129,7 +129,7 @@ export const DealOverview = () => {
 	const onRepaymentTypeChange = (e: any) => {
 		if (repaymentSelectValue !== e.target.value) {
 			setRepaymentSelectValue(e.target.value);
-			setRepaymentAmount(0);
+			setRepaymentAmount(undefined);
 		}
 	};
 
@@ -138,7 +138,6 @@ export const DealOverview = () => {
 		setter: (val: number | undefined) => any
 	) => {
 		const newValue = e.target.value === "" ? undefined : toProgramAmount(Number(e.target.value));
-		console.log(newValue);
 		setter(newValue);
 	};
 

From 0bed5f3c1fdb006c7ab57517da5e3c42365a6001 Mon Sep 17 00:00:00 2001
From: ceunen <bouwe@ceunen.io>
Date: Sat, 11 Dec 2021 18:16:48 +0100
Subject: [PATCH 7/7] revisit token accounts

---
 src/react/components/forms/CreateDealForm.tsx |  47 +---
 src/store/api.ts                              | 201 ++++++++----------
 2 files changed, 103 insertions(+), 145 deletions(-)

diff --git a/src/react/components/forms/CreateDealForm.tsx b/src/react/components/forms/CreateDealForm.tsx
index 9a3bf4c..aff368b 100644
--- a/src/react/components/forms/CreateDealForm.tsx
+++ b/src/react/components/forms/CreateDealForm.tsx
@@ -3,23 +3,19 @@ import { useAnchorWallet, useConnection } from "@solana/wallet-adapter-react";
 import { serialAsync } from "utils/async.utils";
 import React, { useEffect, useState } from "react";
 import { useNotify } from "react/hooks/useNotify";
-import { activateDeal, createDeal, getUserUSDCTokenAccount } from "store/api";
+import { activateDeal, createDeal } from "store/api";
 import "../../../styles/stakeform.scss";
 import { PublicKey } from "@solana/web3.js";
 import { useRefresh } from "react/hooks/useRefresh";
 
-interface Props {
-	disabled?: boolean;
-}
-
-export const CreateDealForm = (props: Props) => {
+export const CreateDealForm = () => {
 	const wallet = useAnchorWallet();
 	const connection = useConnection();
 	const [principal, setPrincipal] = useState<number | undefined>();
 	const [financingFee, setFinancingFee] = useState<number | undefined>();
 	const [timeToMaturity, setTimeToMaturity] = useState<number | undefined>();
 	const [borrower, setBorrower] = useState<string>("");
-	const [placeholder, setPlaceholder] = useState<string>("CONNECT WALLET");
+	const [placeholder, setPlaceholder] = useState<string>("Connect wallet");
 	const notify = useNotify();
 	const triggerRefresh = useRefresh();
 
@@ -55,17 +51,6 @@ export const CreateDealForm = (props: Props) => {
 			return;
 		}
 
-		const depositorLiquidityPoolTokenAccount = await getUserUSDCTokenAccount(
-			connection.connection,
-			wallet as Wallet
-		);
-
-		// Can't we just create a token account using the associated token program when it doesn't exist yet?
-		if (!depositorLiquidityPoolTokenAccount) {
-			notify("error", "Please opt in for USDC in your wallet");
-			return;
-		}
-
 		try {
 			await createDeal(
 				principal,
@@ -95,16 +80,7 @@ export const CreateDealForm = (props: Props) => {
 			validKey = false; // can't have an empty block..
 		}
 
-		return (
-			wallet?.publicKey &&
-			principal &&
-			financingFee &&
-			borrower &&
-			validKey &&
-			!props.disabled &&
-			timeToMaturity &&
-			!(timeToMaturity % 30)
-		);
+		return wallet?.publicKey && principal && financingFee && borrower && validKey;
 	};
 
 	const onChange = (
@@ -149,42 +125,39 @@ export const CreateDealForm = (props: Props) => {
 						value={borrower}
 						placeholder={placeholder}
 						onChange={onChangeBorrower}
-						disabled={!wallet?.publicKey || props.disabled}
+						disabled={!wallet?.publicKey}
 						className="stake-input borrower-pk credix-button MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary balance-button"
 					/>
 				</label>
 				<br />
 				<label className="stake-input-label">
 					Principal
-					<p>The total amount of USDC to borrow</p>
 					<input
 						name="principal"
 						type="number"
 						value={principal === undefined ? "" : principal}
 						placeholder={placeholder}
 						onChange={onChangePrincipal}
-						disabled={!wallet?.publicKey || props.disabled}
+						disabled={!wallet?.publicKey}
 						className="stake-input credix-button MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary balance-button"
 					/>
 				</label>
 				<br />
 				<label className="stake-input-label">
-					Financing fee %
-					<p>The percentage on top of the principal that needs to be repaid as interest</p> 
+					Financing fee
 					<input
 						name="financingFee"
 						type="number"
 						value={financingFee === undefined ? "" : financingFee}
 						placeholder={placeholder}
 						onChange={onChangeFinancingFee}
-						disabled={!wallet?.publicKey || props.disabled}
+						disabled={!wallet?.publicKey}
 						className="stake-input credix-button MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary balance-button"
 					/>
 				</label>
 				<br />
 				<label className="stake-input-label">
 					Time to maturity (days)
-					<p>How many days before you have to pay back the principal</p>
 					<input
 						name="timeToMaturity"
 						type="number"
@@ -193,7 +166,7 @@ export const CreateDealForm = (props: Props) => {
 						placeholder={placeholder}
 						onChange={onChangeTimeToMaturity}
 						onBlur={onBlurTimeToMaturity}
-						disabled={!wallet?.publicKey || props.disabled}
+						disabled={!wallet?.publicKey}
 						className="stake-input credix-button MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary balance-button"
 					/>
 				</label>
@@ -201,7 +174,7 @@ export const CreateDealForm = (props: Props) => {
 				<input
 					type="submit"
 					disabled={!canSubmit()}
-					value={props.disabled ? "Max deals reached" : "Create Deal"}
+					value="Create Deal"
 					className="stake-submit credix-button MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary balance-button"
 				/>
 			</form>
diff --git a/src/store/api.ts b/src/store/api.ts
index 7483d38..2100908 100644
--- a/src/store/api.ts
+++ b/src/store/api.ts
@@ -1,5 +1,5 @@
 import { BN, Program, ProgramAccount, Provider, Wallet, web3 } from "@project-serum/anchor";
-import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
+import { TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, Token } from "@solana/spl-token";
 import { Connection, ParsedAccountData, PublicKey, SystemProgram } from "@solana/web3.js";
 import { config } from "config";
 import { SEEDS } from "consts";
@@ -36,11 +36,6 @@ const findGlobalMarketStatePDA = multiAsync(async () => {
 	return findPDA([seed]);
 });
 
-const findSigningAuthorityPDA = multiAsync(async () => {
-	const seeds: PdaSeeds = [Buffer.from(config.clusterConfig.programId.toString()).subarray(0, 32)];
-	return findPDA(seeds);
-});
-
 const findDepositorLPTokenPDA = multiAsync(async (publicKey: PublicKey) => {
 	const seed = encodeSeedString(SEEDS.DEPOSITOR_LP_TOKEN_ACCOUNT);
 	const seeds: PdaSeeds = [mapPKToSeed(publicKey), seed];
@@ -90,25 +85,31 @@ const getUSDCMintPK = multiAsync(async (connection: Connection, wallet: Wallet)
 	);
 });
 
-export const getUserUSDCTokenAccount = multiAsync(
-	async (connection: Connection, wallet: Wallet) => {
-		const usdcMint = await getUSDCMintPK(connection, wallet);
-		const accounts = await connection.getParsedTokenAccountsByOwner(wallet.publicKey, {
-			mint: usdcMint,
+const getTokenAccount = multiAsync(
+	async (connection: Connection, pubkey: PublicKey, mint: PublicKey) => {
+		const tokenAccounts = await connection.getParsedTokenAccountsByOwner(pubkey, {
+			mint,
 		});
 
-		return accounts.value[0];
+		return tokenAccounts.value[0];
 	}
 );
 
-export const getUserUSDCBalance = multiAsync(async (connection: Connection, wallet: Wallet) => {
-	const tokenAccount = await getUserUSDCTokenAccount(connection, wallet);
+const getUserLPTokenAccount = multiAsync(async (connection: Connection, wallet: Wallet) => {
+	const _depositorLPTokenPDA = findDepositorLPTokenPDA(wallet.publicKey);
+	const _lpTokenMintPDA = findLPTokenMintPDA();
 
-	if (!tokenAccount) {
-		return 0;
-	}
+	const [depositorInvestorTokenPDA, lpTokenMintPDA] = await Promise.all([
+		_depositorLPTokenPDA,
+		_lpTokenMintPDA,
+	]);
 
-	return Number(tokenAccount.account.data.parsed.info.tokenAmount.amount);
+	return getTokenAccount(connection, depositorInvestorTokenPDA[0], lpTokenMintPDA[0]);
+});
+
+export const getUserUSDCBalance = multiAsync(async (connection: Connection, wallet: Wallet) => {
+	const userUSDCTokenBalance = await getUserUSDCTokenBalance(connection, wallet);
+	return Number(userUSDCTokenBalance.value.amount);
 });
 
 const getLiquidityPoolBalance = multiAsync(async (connection: Connection, wallet: Wallet) => {
@@ -136,6 +137,7 @@ const getRunningAPY = multiAsync(async (connection: Connection, wallet: Wallet)
 		throw Error("Could not fetch cluster time");
 	}
 
+	// TODO: is this still correct
 	const runningAPY = (deals as Array<ProgramAccount<Deal>>).reduce((result, deal) => {
 		const status = mapDealToStatus(deal.account, clusterTime);
 		if (status === DealStatus.IN_PROGRESS) {
@@ -195,6 +197,16 @@ const getTreasuryPoolTokenAccountPK = multiAsync(async (connection: Connection,
 	return globalMarketStateData.treasuryPoolTokenAccount;
 });
 
+const getAssociatedUSDCTokenAddressPK = multiAsync(async (connection: Connection, wallet: Wallet) => {
+	const _usdcMintPK = await getUSDCMintPK(connection, wallet);
+	return await Token.getAssociatedTokenAddress(
+		ASSOCIATED_TOKEN_PROGRAM_ID,
+		TOKEN_PROGRAM_ID,
+		_usdcMintPK,
+		wallet.publicKey,
+	);
+});
+
 export const getPoolStats = multiAsync(async (connection: Connection, wallet: Wallet) => {
 	const _tvl = getTVL(connection, wallet);
 	const _apy = getAPY(connection, wallet);
@@ -228,21 +240,11 @@ export const getDepositorInfoAccountData = multiAsync(
 );
 
 export const createDepositor = multiAsync(async (connection: Connection, wallet: Wallet) => {
-	const _globalMarketStatePDA = findGlobalMarketStatePDA();
-	const _signingAuthorityPDA = findSigningAuthorityPDA();
 	const _depositorPDA = findDepositorInfoPDA(wallet.publicKey);
 	const _depositorLPTokenPDA = findDepositorLPTokenPDA(wallet.publicKey);
 	const _lpTokenMintPDA = findLPTokenMintPDA();
 
-	const [
-		globalMarketStatePDA,
-		signingAuthorityPDA,
-		depositorPDA,
-		depositorLPTokenPDA,
-		lpTokenMintPDA,
-	] = await Promise.all([
-		_globalMarketStatePDA,
-		_signingAuthorityPDA,
+	const [depositorPDA, depositorLPTokenPDA, lpTokenMintPDA] = await Promise.all([
 		_depositorPDA,
 		_depositorLPTokenPDA,
 		_lpTokenMintPDA,
@@ -253,8 +255,6 @@ export const createDepositor = multiAsync(async (connection: Connection, wallet:
 	return program.rpc.createDepositor({
 		accounts: {
 			owner: wallet.publicKey,
-			globalMarketState: globalMarketStatePDA[0],
-			signingAuthority: signingAuthorityPDA[0],
 			depositor: wallet.publicKey,
 			depositorInfo: depositorPDA[0],
 			depositorLpTokenAccount: depositorLPTokenPDA[0],
@@ -274,42 +274,34 @@ export const depositInvestment = multiAsync(
 		const _lpTokenMintPDA = findLPTokenMintPDA();
 		const _depositorInfoPDA = findDepositorInfoPDA(wallet.publicKey);
 		const _depositorLPTokenPDA = findDepositorLPTokenPDA(wallet.publicKey);
-		const _userUSDCTokenAccount = getUserUSDCTokenAccount(connection, wallet);
+		const _userAssociatedUSDCTokenAddressPK = getAssociatedUSDCTokenAddressPK(connection, wallet);
 		const _usdcMintPK = getUSDCMintPK(connection, wallet);
 		const _marketUSDCTokenAccountPK = getMarketUSDCTokenAccountPK(connection, wallet);
-		const _signingAuthorityPDA = findSigningAuthorityPDA();
 
 		const [
 			globalMarketStatePDA,
 			lpTokenMintPDA,
 			depositorInfoPDA,
 			depositorLPTokenPDA,
-			userUSDCTokenAccount,
+			userAssociatedUSDCTokenAddressPK,
 			usdcMintPK,
 			marketUSDCTokenAccountPK,
-			signingAuthorityPDA,
 		] = await Promise.all([
 			_globalMarketStatePDA,
 			_lpTokenMintPDA,
 			_depositorInfoPDA,
 			_depositorLPTokenPDA,
-			_userUSDCTokenAccount,
+			_userAssociatedUSDCTokenAddressPK,
 			_usdcMintPK,
 			_marketUSDCTokenAccountPK,
-			_signingAuthorityPDA,
 		]);
 
-		if (!userUSDCTokenAccount) {
-			throw Error("No USDC token accounts found for depositor");
-		}
-
-		return program.rpc.depositFunds(signingAuthorityPDA[1], depositAmount, {
+		return program.rpc.depositFunds(lpTokenMintPDA[1], depositAmount, {
 			accounts: {
 				depositor: wallet.publicKey,
 				globalMarketState: globalMarketStatePDA[0],
-				signingAuthority: signingAuthorityPDA[0],
 				depositorInfo: depositorInfoPDA[0],
-				depositorTokenAccount: userUSDCTokenAccount.pubkey,
+				depositorTokenAccount: userAssociatedUSDCTokenAddressPK,
 				liquidityPoolTokenAccount: marketUSDCTokenAccountPK,
 				lpTokenMintAccount: lpTokenMintPDA[0],
 				depositorLpTokenAccount: depositorLPTokenPDA[0],
@@ -326,55 +318,56 @@ export const withdrawInvestment = multiAsync(
 		const _lpTokenPrice = getLPTokenPrice(connection, wallet);
 		const _globalMarketStatePDA = findGlobalMarketStatePDA();
 		const _depositorLPTokenPDA = findDepositorLPTokenPDA(wallet.publicKey);
-		const _userUSDCTokenAccount = getUserUSDCTokenAccount(connection, wallet);
+		const _userAssociatedUSDCTokenAddressPK = getAssociatedUSDCTokenAddressPK(connection, wallet);
+		const _marketUSDCTokenPDA = findMarketUSDCTokenPDA();
 		const _lpTokenMintPDA = findLPTokenMintPDA();
 		const _usdcMint = getUSDCMintPK(connection, wallet);
 		const _marketUSDCTokenAccountPK = getMarketUSDCTokenAccountPK(connection, wallet);
 		const _treasuryPoolTokenAccountPK = getTreasuryPoolTokenAccountPK(connection, wallet);
-		const _signingAuthorityPDA = findSigningAuthorityPDA();
 
 		const [
 			lpTokenPrice,
 			globalMarketStatePDA,
 			depositorLPTokenPDA,
-			userUSDCTokenAccount,
+			userAssociatedUSDCTokenAddressPK,
+			marketUSDCTokenPDA,
 			lpTokenMintPDA,
 			usdcMint,
 			marketUSDCTokenAccountPK,
 			treasuryPoolTokenAccountPK,
-			signingAuthorityPDA,
 		] = await Promise.all([
 			_lpTokenPrice,
 			_globalMarketStatePDA,
 			_depositorLPTokenPDA,
-			_userUSDCTokenAccount,
+			_userAssociatedUSDCTokenAddressPK,
+			_marketUSDCTokenPDA,
 			_lpTokenMintPDA,
 			_usdcMint,
 			_marketUSDCTokenAccountPK,
 			_treasuryPoolTokenAccountPK,
-			_signingAuthorityPDA,
 		]);
 
+		// TODO: should we floor here to be safe?
 		const withdrawAmount = new BN(toProgramAmount(amount / lpTokenPrice));
 
-		if (!userUSDCTokenAccount) {
-			throw Error("No USDC token accounts found for depositor");
-		}
-
-		return program.rpc.withdrawFunds(signingAuthorityPDA[1], withdrawAmount, {
-			accounts: {
-				withdrawer: wallet.publicKey,
-				globalMarketState: globalMarketStatePDA[0],
-				signingAuthority: signingAuthorityPDA[0],
-				withdrawerLpTokenAccount: depositorLPTokenPDA[0],
-				withdrawerTokenAccount: userUSDCTokenAccount.pubkey,
-				liquidityPoolTokenAccount: marketUSDCTokenAccountPK,
-				treasuryPoolTokenAccount: treasuryPoolTokenAccountPK,
-				lpTokenMintAccount: lpTokenMintPDA[0],
-				usdcMintAccount: usdcMint,
-				tokenProgram: TOKEN_PROGRAM_ID,
-			},
-		});
+		return program.rpc.withdrawFunds(
+			marketUSDCTokenPDA[1],
+			depositorLPTokenPDA[1],
+			withdrawAmount,
+			{
+				accounts: {
+					withdrawer: wallet.publicKey,
+					globalMarketState: globalMarketStatePDA[0],
+					withdrawerLpTokenAccount: depositorLPTokenPDA[0],
+					withdrawerTokenAccount: userAssociatedUSDCTokenAddressPK,
+					liquidityPoolTokenAccount: marketUSDCTokenAccountPK,
+					treasuryPoolTokenAccount: treasuryPoolTokenAccountPK,
+					lpTokenMintAccount: lpTokenMintPDA[0],
+					usdcMintAccount: usdcMint,
+					tokenProgram: TOKEN_PROGRAM_ID,
+				},
+			}
+		);
 	}
 );
 
@@ -393,15 +386,19 @@ export const createDeal = multiAsync(
 		connection: Connection,
 		wallet: Wallet
 	) => {
-		const dealPDA = await findDealPDA(wallet.publicKey);
+		const _dealPDA = findDealPDA(wallet.publicKey);
+		const _globalMarketStatePDA = findGlobalMarketStatePDA();
 		const program = constructProgram(connection, wallet);
 
+		const [dealPDA, globalMarketStatePDA] = await Promise.all([_dealPDA, _globalMarketStatePDA]);
+
 		const principalAmount = new BN(toProgramAmount(principal));
 		const financingFeeAmount = new BN(toProgramPercentage(financingFee));
 
 		return program.rpc.createDeal(principalAmount, financingFeeAmount, 0, 0, timeToMaturity, {
 			accounts: {
 				borrower: borrower,
+				globalMarketState: globalMarketStatePDA[0],
 				deal: dealPDA[0],
 				systemProgram: SystemProgram.programId,
 			},
@@ -411,44 +408,32 @@ export const createDeal = multiAsync(
 
 export const activateDeal = multiAsync(async (connection: Connection, wallet: Wallet) => {
 	const program = constructProgram(connection, wallet);
-	const _userUSDCTokenAccount = getUserUSDCTokenAccount(connection, wallet);
+	const _userAssociatedUSDCTokenAddressPK = getAssociatedUSDCTokenAddressPK(connection, wallet);
 	const _usdcMintPK = getUSDCMintPK(connection, wallet);
 	const _marketUSDCTokenPDA = findMarketUSDCTokenPDA();
 	const _globalMarketStatePDA = findGlobalMarketStatePDA();
 	const _dealPDA = findDealPDA(wallet.publicKey);
-	const _signingAuthorityPDA = findSigningAuthorityPDA();
-
-	const [
-		userUSDCTokenAccount,
-		usdcMintPK,
-		marketUSDCTokenPDA,
-		globalMarketStatePDA,
-		dealPDA,
-		signingAuthorityPDA,
-	] = await Promise.all([
-		_userUSDCTokenAccount,
-		_usdcMintPK,
-		_marketUSDCTokenPDA,
-		_globalMarketStatePDA,
-		_dealPDA,
-		_signingAuthorityPDA,
-	]);
 
-	if (!userUSDCTokenAccount) {
-		throw Error("No USDC token accounts found for depositor");
-	}
+	const [userAssociatedUSDCTokenAddressPK, usdcMintPK, marketUSDCTokenPDA, globalMarketStatePDA, dealPDA] =
+		await Promise.all([
+			_userAssociatedUSDCTokenAddressPK,
+			_usdcMintPK,
+			_marketUSDCTokenPDA,
+			_globalMarketStatePDA,
+			_dealPDA,
+		]);
 
-	return program.rpc.activateDeal(signingAuthorityPDA[1], {
+	return program.rpc.activateDeal(marketUSDCTokenPDA[1], {
 		accounts: {
 			owner: wallet.publicKey,
 			globalMarketState: globalMarketStatePDA[0],
-			signingAuthority: signingAuthorityPDA[0],
 			deal: dealPDA[0],
 			liquidityPoolTokenAccount: marketUSDCTokenPDA[0],
-			borrowerTokenAccount: userUSDCTokenAccount.pubkey,
+			borrowerTokenAccount: userAssociatedUSDCTokenAddressPK,
 			usdcMintAccount: usdcMintPK,
 			tokenProgram: TOKEN_PROGRAM_ID,
 			systemProgram: SystemProgram.programId,
+			rent: web3.SYSVAR_RENT_PUBKEY,
 		},
 	});
 });
@@ -474,21 +459,25 @@ const getLPTokenPrice = multiAsync(async (connection: Connection, wallet: Wallet
 	return lpTokenSupply && divide(outstandingCredit + liquidityPoolBalance, lpTokenSupply);
 });
 
-const getUserLPTokenBalance = multiAsync(async (connection: Connection, wallet: Wallet) => {
-	const depositorLPTokenPDA = await findDepositorLPTokenPDA(wallet.publicKey);
-	return connection.getTokenAccountBalance(depositorLPTokenPDA[0]);
+const getUserUSDCTokenBalance = multiAsync(async (connection: Connection, wallet: Wallet) => {
+	const depositorUSDCTokenAccountPK = await getAssociatedUSDCTokenAddressPK(connection, wallet);
+	return connection.getTokenAccountBalance(depositorUSDCTokenAccountPK);
 });
 
 export const getLPTokenUSDCBalance = multiAsync(async (connection: Connection, wallet: Wallet) => {
 	const _lpTokenPrice = getLPTokenPrice(connection, wallet);
-	const _userLPTokenBalance = getUserLPTokenBalance(connection, wallet);
+	const _userLPTokenAccount = getUserLPTokenAccount(connection, wallet);
 
-	const [lpTokenPrice, userLPTokenBalance] = await Promise.all([
+	const [lpTokenPrice, userLPTokenAccount] = await Promise.all([
 		_lpTokenPrice,
-		_userLPTokenBalance,
+		_userLPTokenAccount,
 	]);
 
-	const userLPTokenAmount = Number(userLPTokenBalance.value.amount);
+	if (!userLPTokenAccount) {
+		return 0;
+	}
+
+	const userLPTokenAmount = Number(userLPTokenAccount.account.data.parsed.info.tokenAmount.amount);
 
 	return userLPTokenAmount * lpTokenPrice;
 });
@@ -499,7 +488,7 @@ export const repayDeal = multiAsync(
 		const repayAmount = new BN(amount);
 
 		const _globalMarketStatePDA = findGlobalMarketStatePDA();
-		const _userUSDCTokenAccount = getUserUSDCTokenAccount(connection, wallet);
+		const _userAssociatedUSDCTokenAddressPK = getAssociatedUSDCTokenAddressPK(connection, wallet);
 		const _dealPDA = findDealPDA(wallet.publicKey);
 		const _marketUSDCTokenPDA = findMarketUSDCTokenPDA();
 		const _usdcMintPK = getUSDCMintPK(connection, wallet);
@@ -507,29 +496,25 @@ export const repayDeal = multiAsync(
 
 		const [
 			globalMarketStatePDA,
-			userUSDCTokenAccount,
+			userAssociatedUSDCTokenAddressPK,
 			dealPDA,
 			marketUSDCTokenPDA,
 			usdcMintPK,
 			treasuryPoolTokenAccountPK,
 		] = await Promise.all([
 			_globalMarketStatePDA,
-			_userUSDCTokenAccount,
+			_userAssociatedUSDCTokenAddressPK,
 			_dealPDA,
 			_marketUSDCTokenPDA,
 			_usdcMintPK,
 			_treasuryPoolTokenAccountPK,
 		]);
 
-		if (!userUSDCTokenAccount) {
-			throw Error("No USDC token accounts found for depositor");
-		}
-
 		await program.rpc.makeDealRepayment(repayAmount, repaymentType, {
 			accounts: {
 				borrower: wallet.publicKey,
 				globalMarketState: globalMarketStatePDA[0],
-				borrowerTokenAccount: userUSDCTokenAccount.pubkey,
+				borrowerTokenAccount: userAssociatedUSDCTokenAddressPK,
 				deal: dealPDA[0],
 				liquidityPoolTokenAccount: marketUSDCTokenPDA[0],
 				treasuryPoolTokenAccount: treasuryPoolTokenAccountPK,