fixed merge conflicts and renamed exports (#50)

src/features/common/LineBreak.tsx

@@ -4,7 +4,7 @@ import { twJoin } from "tailwind-merge";
 interface LineBreakProps {
   className?: string;
 }
-const LineBreak: FC<LineBreakProps> = ({ className }) => {
+export const LineBreak: FC<LineBreakProps> = ({ className }) => {
   return (
     <hr
       className={twJoin([
@@ -14,5 +14,3 @@ const LineBreak: FC<LineBreakProps> = ({ className }) => {
     />
   );
 };
-
-export default LineBreak;

src/features/staking/StakeButton.tsx

@@ -3,7 +3,7 @@ import { twJoin } from "tailwind-merge";
 import { useAccount, useNetwork } from "wagmi";
 import { useTokenBalances } from "../../hooks/useTokenBalances";
 import { Button } from "../common/Button";
-import StakingModal from "./StakingModal";
+import { StakingModal } from "./StakingModal";
 
 export const StakeButton = ({}: {}) => {
   const { address, isConnected } = useAccount();

src/features/staking/StakingModal.tsx

@@ -2,15 +2,14 @@ import { FC, RefObject, useState } from "react";
 import { useForm } from "react-hook-form";
 import { ImSpinner8 } from "react-icons/im";
 import { VscChromeClose } from "react-icons/vsc";
-import { useForm } from "react-hook-form";
 import { twJoin } from "tailwind-merge";
 import { useTokenBalances } from "../../hooks/useTokenBalances";
 import { Button } from "../common/Button";
 import { useApproveAst } from "./hooks/useApproveAst";
 import { useAstAllowance } from "./hooks/useAstAllowance";
 import { useStakeAst } from "./hooks/useStakeAst";
 import { useUnstakeSast } from "./hooks/useUnstakeSast";
-import ApproveSuccess from "./subcomponents/ApproveSuccess";
+import { ApproveSuccess } from "./subcomponents/ApproveSuccess";
 import { ManageStake } from "./subcomponents/ManageStake";
 import { StakeOrUnstake } from "./types/StakingTypes";
 import {
@@ -25,7 +24,7 @@ interface StakingModalInterface {
   chainId: number;
 }
 
-const StakingModal: FC<StakingModalInterface> = ({
+export const StakingModal: FC<StakingModalInterface> = ({
   stakingModalRef,
   chainId,
 }) => {
@@ -172,5 +171,3 @@ const StakingModal: FC<StakingModalInterface> = ({
     </dialog>
   );
 };
-
-export default StakingModal;

src/features/staking/subcomponents/ApproveSuccess.tsx

@@ -13,7 +13,7 @@ interface ApproveSuccessProps {
   transactionHashUnstake?: string | undefined;
 }
 
-const ApproveSuccess: FC<ApproveSuccessProps> = ({
+export const ApproveSuccess: FC<ApproveSuccessProps> = ({
   stakeOrUnstake,
   amount,
   chainId,
@@ -61,5 +61,3 @@ const ApproveSuccess: FC<ApproveSuccessProps> = ({
     </div>
   );
 };
-
-export default ApproveSuccess;

src/features/staking/subcomponents/ManageStake.tsx

@@ -4,10 +4,10 @@ import { twJoin } from "tailwind-merge";
 import AirSwapLogo from "../../../assets/airswap-logo.svg";
 import { useTokenBalances } from "../../../hooks/useTokenBalances";
 import { Button } from "../../common/Button";
-import LineBreak from "../../common/LineBreak";
+import { LineBreak } from "../../common/LineBreak";
 import { StakeOrUnstake, Status } from "../types/StakingTypes";
-import { StakableBar } from "./StakableBar";
 import { NumberInput } from "./NumberInput";
+import { StakableBar } from "./StakableBar";
 
 interface ManageStakeProps {
   formReturn: UseFormReturn<FieldValues>;
@@ -71,7 +71,7 @@ export const ManageStake: FC<ManageStakeProps> = ({
         <div className="flex flex-col text-right  uppercase">
           <div>
             <NumberInput
-              astBalance={astBalance}
+              astBalance={astBalance.toString()}
               formReturn={formReturn}
               name="stakingAmount"
             />
@@ -81,4 +81,4 @@ export const ManageStake: FC<ManageStakeProps> = ({
       </div>
     </>
   );
-};
+};

src/features/staking/utils/helpers.ts

@@ -1,4 +1,4 @@
-import { UseFormSetValue } from "react-hook-form";
+import { FieldValues, UseFormSetValue } from "react-hook-form";
 import { WriteContractResult } from "wagmi/actions";
 import { StakeOrUnstake, Status } from "../types/StakingTypes";
 
@@ -60,7 +60,6 @@ export const buttonLoadingSpinner = ({
   }
 };
 
-// TODO: fix this
 export const modalHeadline = ({
   statusStake,
   statusUnstake,
@@ -112,7 +111,7 @@ export const handleButtonActions = ({
   approve: (() => Promise<WriteContractResult>) | undefined;
   stake: (() => void) | undefined;
   unstake: (() => void) | undefined;
-  setValue: UseFormSetValue<{ stakingAmount: number }>;
+  setValue: UseFormSetValue<FieldValues>;
 }) => {
   const stakeMode = stakeOrUnstake === StakeOrUnstake.STAKE;