Deal token transfer modal (#1052)

* Deal token transfer modal was introduced * Add transfer logic (only for 0 id for now) * Add multi tokens transfer logic * Contracts updated * Multicall * Contracts updated * Update ABI * Fix decimal issue * Format * math fix (#1054) * Fix nothing to claim * Fix nothing to claim v2 * Clear modal input values after tx is confirmed (#1056) * Add refresh on successful transfer (#1055) * Add refresh on successful transfer * Fix updates --------- Co-authored-by: saeta.eth <saeta@aelindao.xyz> Co-authored-by: 0xcdb <90234851+0xcdb@users.noreply.github.com>
AelinXYZ · Jun 30, 2023 · 029872b · 029872b
1 parent 6b2dea5
commit 029872b
Show file tree

Hide file tree

Showing 14 changed files with 928 additions and 180 deletions.
diff --git a/src/abis/AelinDeal_v1.json b/src/abis/AelinDeal_v1.json
@@ -742,6 +742,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes[]",
+        "name": "data",
+        "type": "bytes[]"
+      }
+    ],
+    "name": "multicall",
+    "outputs": [
+      {
+        "internalType": "bytes[]",
+        "name": "results",
+        "type": "bytes[]"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "name",
@@ -968,7 +987,7 @@
   },
   {
     "inputs": [],
-    "name": "totalProtocolFee",
+    "name": "totalDealTokenAccepted",
     "outputs": [
       {
         "internalType": "uint256",
@@ -981,7 +1000,7 @@
   },
   {
     "inputs": [],
-    "name": "totalUnderlyingAccepted",
+    "name": "totalProtocolFee",
     "outputs": [
       {
         "internalType": "uint256",
@@ -1216,4 +1235,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]
diff --git a/src/abis/AelinUpfrontDeal_v1.json b/src/abis/AelinUpfrontDeal_v1.json
@@ -36,25 +36,6 @@
     "name": "AcceptDeal",
     "type": "event"
   },
-  {
-    "anonymous": false,
-    "inputs": [
-        {
-            "indexed": true,
-            "internalType": "address",
-            "name": "collection",
-            "type": "address"
-        },
-        {
-            "indexed": false,
-            "internalType": "uint256",
-            "name": "nftID",
-            "type": "uint256"
-        }
-    ],
-    "name": "BlacklistNFT",
-    "type": "event"
-  },
   {
     "anonymous": false,
     "inputs": [
@@ -1385,6 +1366,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes[]",
+        "name": "data",
+        "type": "bytes[]"
+      }
+    ],
+    "name": "multicall",
+    "outputs": [
+      {
+        "internalType": "bytes[]",
+        "name": "results",
+        "type": "bytes[]"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "name",
@@ -1813,4 +1813,4 @@
     "stateMutability": "nonpayable",
     "type": "function"
   }
-]
+]
diff --git a/src/components/form/TokenInput.tsx b/src/components/form/TokenInput.tsx
@@ -64,9 +64,10 @@ interface Props {
   disabled?: boolean
   error?: string
   maxDisabled?: boolean
-  maxValue: string
+  maxValue?: string
   withBalance?: boolean
-  maxValueFormatted: string
+  withMaxButton?: boolean
+  maxValueFormatted?: string
   setValue: (value: string) => void
   value: string
   symbol?: string
@@ -79,12 +80,13 @@ export const TokenInput = ({
   error,
   maxAllocationFormatted,
   maxDisabled,
-  maxValue,
+  maxValue = '',
   maxValueFormatted,
   setValue,
   symbol,
   value,
   withBalance = true,
+  withMaxButton = true,
   ...restProps
 }: Props) => {
   const setMax = () => setValue(maxValue)
@@ -106,9 +108,11 @@ export const TokenInput = ({
           )}
           value={value}
         />
-        <MaxButton disabled={maxDisabled} onClick={setMax}>
-          Max
-        </MaxButton>
+        {withMaxButton && (
+          <MaxButton disabled={maxDisabled} onClick={setMax}>
+            Max
+          </MaxButton>
+        )}
       </InputWrapper>
       {withBalance && (
         <Balance>

diff --git a/src/components/pools/PoolMain.tsx b/src/components/pools/PoolMain.tsx
@@ -6,6 +6,8 @@ import styled from 'styled-components'
 
 import NoActions from './actions/NoActions'
 import ClaimUpfrontDealTokens from './actions/Vest/ClaimUpfrontDealTokens'
+import TransferVestingShareModal from './actions/Vest/TransferVestingShareModal'
+import UpfrontDealTransferVestingShareModal from './actions/Vest/UpfrontDealTransferVestingShareModal'
 import VestUpfrontDeal from './actions/Vest/VestUpfrontDeal'
 import Vouch from './actions/Vouch/Vouch'
 import InvestorsModal from './common/InvestorsModal'
@@ -108,6 +110,9 @@ export default function PoolMain({ chainId, poolAddress }: Props) {
   const { currentThemeName } = useThemeContext()
 
   const [showInvestorsModal, setShowInvestorsModal] = useState<boolean>(false)
+  const [showTransferVestingShareModal, setShowTransferVestingShareModal] = useState<boolean>(false)
+  const [showUpfrontDealTransferVestingShareModal, setUpfrontDealShowTransferVestingShareModal] =
+    useState<boolean>(false)
 
   const { derivedStatus, funding, pool, tabs, timeline } = useAelinPoolStatus(
     chainId,
@@ -192,6 +197,11 @@ export default function PoolMain({ chainId, poolAddress }: Props) {
                     activeTab={tabs.actionTabs.active}
                     derivedStatus={derivedStatus}
                     funding={funding}
+                    handleTransfer={() =>
+                      pool.upfrontDeal
+                        ? setUpfrontDealShowTransferVestingShareModal(true)
+                        : setShowTransferVestingShareModal(true)
+                    }
                     isUpfrontDeal={!!pool.upfrontDeal}
                     pool={pool}
                   />
@@ -209,6 +219,18 @@ export default function PoolMain({ chainId, poolAddress }: Props) {
         </MainGrid>
         {showInvestorsModal && <InvestorsModal onClose={handleCloseInvestorsModal} pool={pool} />}
       </RightTimelineLayout>
+      {showTransferVestingShareModal && (
+        <TransferVestingShareModal
+          onClose={() => setShowTransferVestingShareModal(false)}
+          poolAddress={pool.address}
+        />
+      )}
+      {showUpfrontDealTransferVestingShareModal && (
+        <UpfrontDealTransferVestingShareModal
+          onClose={() => setUpfrontDealShowTransferVestingShareModal(false)}
+          poolAddress={pool.address}
+        />
+      )}
     </>
   )
 }
@@ -219,6 +241,7 @@ type DealActionTabsProps = {
   activeTab: PoolAction | null
   derivedStatus: DerivedStatus
   funding: Funding
+  handleTransfer: () => void
 }
 function DealActionTabs({ ...props }: DealActionTabsProps) {
   return props.isUpfrontDeal ? (
@@ -228,7 +251,13 @@ function DealActionTabs({ ...props }: DealActionTabsProps) {
   )
 }
 
-function RegularPoolsActionTabs({ activeTab, derivedStatus, funding, pool }: DealActionTabsProps) {
+function RegularPoolsActionTabs({
+  activeTab,
+  derivedStatus,
+  funding,
+  handleTransfer,
+  pool,
+}: DealActionTabsProps) {
   return (
     <>
       {!activeTab && <NoActions pool={pool} status={derivedStatus} />}
@@ -238,14 +267,20 @@ function RegularPoolsActionTabs({ activeTab, derivedStatus, funding, pool }: Dea
       {activeTab === PoolAction.CreateDeal && <CreateDeal pool={pool} />}
       {activeTab === PoolAction.AcceptDeal && <AcceptDeal pool={pool} />}
       {activeTab === PoolAction.FundDeal && <FundDeal pool={pool} />}
-      {activeTab === PoolAction.Vest && <Vest pool={pool} />}
+      {activeTab === PoolAction.Vest && <Vest handleTransfer={handleTransfer} pool={pool} />}
       {activeTab === PoolAction.WithdrawUnredeemed && <WithdrawUnredeemed pool={pool} />}
       {activeTab === PoolAction.SponsorClaim && <SponsorClaim pool={pool} />}
     </>
   )
 }
 
-function UpfrontDealActionTabs({ activeTab, derivedStatus, funding, pool }: DealActionTabsProps) {
+function UpfrontDealActionTabs({
+  activeTab,
+  derivedStatus,
+  funding,
+  handleTransfer,
+  pool,
+}: DealActionTabsProps) {
   return (
     <>
       {!activeTab && <NoActions pool={pool} status={derivedStatus} />}
@@ -256,7 +291,9 @@ function UpfrontDealActionTabs({ activeTab, derivedStatus, funding, pool }: Deal
         <WaitingForDeal isUpfrontDeal={!!pool.upfrontDeal} />
       )}
       {activeTab === PoolAction.FundDeal && <FundDeal pool={pool} />}
-      {activeTab === PoolAction.Vest && <VestUpfrontDeal pool={pool} />}
+      {activeTab === PoolAction.Vest && (
+        <VestUpfrontDeal handleTransfer={handleTransfer} pool={pool} />
+      )}
       {activeTab === PoolAction.Settle && (
         <ClaimUpfrontDealTokens
           pool={pool}