From f86e70c249c3e3db6787b2fb1e84770f09f790b3 Mon Sep 17 00:00:00 2001
From: ChouAndy <andy@dinngo.co>
Date: Thu, 25 Nov 2021 18:14:11 +0800
Subject: [PATCH 1/2] chore: update investable.token.address to
 investable.address

---
 packages/mask/src/plugins/Furucombo/UI/FurucomboView.tsx   | 2 +-
 packages/mask/src/plugins/Furucombo/UI/InvestmentsView.tsx | 4 ++--
 packages/mask/src/plugins/Furucombo/UI/PoolView.tsx        | 2 +-
 packages/mask/src/plugins/Furucombo/types.tsx              | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/mask/src/plugins/Furucombo/UI/FurucomboView.tsx b/packages/mask/src/plugins/Furucombo/UI/FurucomboView.tsx
index d4521f866ec5..8beeb0e2ebe6 100644
--- a/packages/mask/src/plugins/Furucombo/UI/FurucomboView.tsx
+++ b/packages/mask/src/plugins/Furucombo/UI/FurucomboView.tsx
@@ -98,7 +98,7 @@ export function FurucomboView(props: PoolViewProps) {
 
     const investable = investables.find(
         (investable: Investable) =>
-            isSameAddress(investable.token.address, props.address) &&
+            isSameAddress(investable.address, props.address) &&
             investable.chainId === currentChainId &&
             investable.category === props.category,
     )
diff --git a/packages/mask/src/plugins/Furucombo/UI/InvestmentsView.tsx b/packages/mask/src/plugins/Furucombo/UI/InvestmentsView.tsx
index 8274867826c6..4b0357ff2ca2 100644
--- a/packages/mask/src/plugins/Furucombo/UI/InvestmentsView.tsx
+++ b/packages/mask/src/plugins/Furucombo/UI/InvestmentsView.tsx
@@ -217,7 +217,7 @@ export function InvestmentsView(props: InvestmentsProps) {
                         ? investables.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage)
                         : investables
                     ).map((row: Investable) => (
-                        <TableRow key={row.token.address} className={classes.row}>
+                        <TableRow key={row.address} className={classes.row}>
                             <TableCell
                                 className={classes.cell}
                                 component="th"
@@ -231,7 +231,7 @@ export function InvestmentsView(props: InvestmentsProps) {
                                 <Button
                                     className={classes.invest}
                                     size="small"
-                                    href={`${BASE_URL}/${row.category}/${row.chainId}/${row.token.address}`}
+                                    href={`${BASE_URL}/${row.category}/${row.chainId}/${row.address}`}
                                     target="_blank">
                                     {t('plugin_furucombo_invest')}
                                 </Button>
diff --git a/packages/mask/src/plugins/Furucombo/UI/PoolView.tsx b/packages/mask/src/plugins/Furucombo/UI/PoolView.tsx
index ee31505ed093..6c02f2ddd19b 100644
--- a/packages/mask/src/plugins/Furucombo/UI/PoolView.tsx
+++ b/packages/mask/src/plugins/Furucombo/UI/PoolView.tsx
@@ -89,7 +89,7 @@ export function PoolView(props: PoolProps) {
     const {
         category,
         chainId,
-        token: { address },
+        address,
         name,
         protocol,
         liquidity,
diff --git a/packages/mask/src/plugins/Furucombo/types.tsx b/packages/mask/src/plugins/Furucombo/types.tsx
index dd1f521f2ee9..663c962500a6 100644
--- a/packages/mask/src/plugins/Furucombo/types.tsx
+++ b/packages/mask/src/plugins/Furucombo/types.tsx
@@ -12,6 +12,7 @@ export interface Investable {
     stakingToken: Token | null
     strategies: Strategy[]
     swapProtocol: string | null
+    address: string;
     token: Token
     tokens: Token[]
     updatedAt: string

From da75545af7716412f95335581f6aa2891704d14e Mon Sep 17 00:00:00 2001
From: ChouAndy <andy@dinngo.co>
Date: Sat, 27 Nov 2021 11:50:46 +0800
Subject: [PATCH 2/2] fix: eslint errors

---
 packages/mask/src/plugins/Furucombo/UI/PoolView.tsx | 11 +----------
 packages/mask/src/plugins/Furucombo/types.tsx       |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/mask/src/plugins/Furucombo/UI/PoolView.tsx b/packages/mask/src/plugins/Furucombo/UI/PoolView.tsx
index 6c02f2ddd19b..fab4ca11dab0 100644
--- a/packages/mask/src/plugins/Furucombo/UI/PoolView.tsx
+++ b/packages/mask/src/plugins/Furucombo/UI/PoolView.tsx
@@ -86,16 +86,7 @@ interface PoolProps {
 export function PoolView(props: PoolProps) {
     const { classes } = useStyles()
     const { t } = useI18N()
-    const {
-        category,
-        chainId,
-        address,
-        name,
-        protocol,
-        liquidity,
-        apy,
-        angels,
-    } = props.investable
+    const { category, chainId, address, name, protocol, liquidity, apy, angels } = props.investable
 
     const displayRewardIcon = (rewardToken: Token) => {
         if (rewardToken.symbol === 'WMATIC') return <WmaticIcon />
diff --git a/packages/mask/src/plugins/Furucombo/types.tsx b/packages/mask/src/plugins/Furucombo/types.tsx
index 663c962500a6..d7f6db78ef1f 100644
--- a/packages/mask/src/plugins/Furucombo/types.tsx
+++ b/packages/mask/src/plugins/Furucombo/types.tsx
@@ -12,7 +12,7 @@ export interface Investable {
     stakingToken: Token | null
     strategies: Strategy[]
     swapProtocol: string | null
-    address: string;
+    address: string
     token: Token
     tokens: Token[]
     updatedAt: string