From 280256d23e5cf6c3106c2ca4ec247a55069dd8ed Mon Sep 17 00:00:00 2001
From: Yunoek <Yunoek@pm.me>
Date: Sat, 28 May 2022 20:56:06 +0200
Subject: [PATCH] fix: fixing imaginary rules

---
 components/ffGauges/ffGaugesTable.js |  2 +-
 components/ffSwap/setup.js           |  4 +--
 stores/fixedForexStore.js            | 40 +++++++++++++++++++---------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/components/ffGauges/ffGaugesTable.js b/components/ffGauges/ffGaugesTable.js
index b5764cb..6ce98b2 100644
--- a/components/ffGauges/ffGaugesTable.js
+++ b/components/ffGauges/ffGaugesTable.js
@@ -307,7 +307,7 @@ export default function EnhancedTable({ gauges, setParentSliderValues, defaultVo
                   </TableCell>
                   <TableCell className={classes.cell} align="right">
                     <Typography variant="h2" className={classes.textSpaced}>
-                      { formatCurrency(row?.gauge?.userGaugeBalance) } { row.symbol }
+                      { formatCurrency(row?.gauge?.userGaugeBalance) } { row.symbolAlt }
                     </Typography>
                     <Typography variant="h5" className={classes.textSpaced} color='textSecondary'>
                       $ { formatCurrency(0.00) }
diff --git a/components/ffSwap/setup.js b/components/ffSwap/setup.js
index 91ae617..ec03c9e 100644
--- a/components/ffSwap/setup.js
+++ b/components/ffSwap/setup.js
@@ -432,7 +432,7 @@ function AssetSelect({ type, value, assetOptions, onSelect }) {
             <img
               className={ classes.displayAssetIconSmall }
               alt=""
-              src={ (asset && asset.icon) ? asset.icon : `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${asset?.logoAddress || asset?.address}/logo-128.png` }
+              src={ (asset && asset.icon) ? asset.icon : `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${asset?.address}/logo-128.png` }
               height='60px'
               onError={(e)=>{e.target.onerror = null; e.target.src="/tokens/unknown-logo.png"}}
             />
@@ -458,7 +458,7 @@ function AssetSelect({ type, value, assetOptions, onSelect }) {
             <img
               className={ classes.displayAssetIcon }
               alt=""
-              src={ (value && value.icon) ? value.icon : `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${value?.logoAddress || value?.address}/logo-128.png` }
+              src={ (value && value.icon) ? value.icon : `https://raw.githubusercontent.com/yearn/yearn-assets/master/icons/multichain-tokens/1/${value?.address}/logo-128.png` }
               height='100px'
               onError={(e)=>{e.target.onerror = null; e.target.src="/tokens/unknown-logo.png"}}
             />
diff --git a/stores/fixedForexStore.js b/stores/fixedForexStore.js
index 9444c1c..d657735 100644
--- a/stores/fixedForexStore.js
+++ b/stores/fixedForexStore.js
@@ -556,6 +556,7 @@ class Store {
       {
         address: KP3RETH_ADDRESS,
         logoAddress: KP3RETH_ADDRESS,
+        symbolAlt: "WETH+KP3R",
         symbol: "ETH+KP3R",
         shouldUseNewABI: true,
         decimals: 18,
@@ -584,7 +585,8 @@ class Store {
       {
         address: IBAUDUSDC_ADDRESS,
         logoAddress: IBAUDUSDC_ADDRESS,
-        symbol: "ibAUD+USDC",
+        symbolAlt: "ibAUD+USDC",
+        symbol: "ibAUD",
         shouldUseNewABI: true,
         decimals: 18,
         name: "Curve ibaudusdc pool",
@@ -612,7 +614,8 @@ class Store {
       {
         address: IBCHFUSDC_ADDRESS,
         logoAddress: IBCHFUSDC_ADDRESS,
-        symbol: "ibCHF+USDC",
+        symbolAlt: "ibCHF+USDC",
+        symbol: "ibCHF",
         shouldUseNewABI: true,
         decimals: 18,
         name: "Curve ibchfusdc pool",
@@ -640,7 +643,8 @@ class Store {
       {
         address: IBEURUSDC_ADDRESS,
         logoAddress: IBEURUSDC_ADDRESS,
-        symbol: "ibEUR+USDC",
+        symbolAlt: "ibEUR+USDC",
+        symbol: "ibEUR",
         shouldUseNewABI: true,
         decimals: 18,
         name: "Curve ibeurusdc pool",
@@ -668,7 +672,8 @@ class Store {
       {
         address: IBGBPUSDC_ADDRESS,
         logoAddress: IBGBPUSDC_ADDRESS,
-        symbol: "ibGBP+USDC",
+        symbolAlt: "ibGBP+USDC",
+        symbol: "ibGBP",
         shouldUseNewABI: true,
         decimals: 18,
         name: "Curve ibgbpusdc pool",
@@ -696,7 +701,8 @@ class Store {
       {
         address: IBJPYUSDC_ADDRESS,
         logoAddress: IBJPYUSDC_ADDRESS,
-        symbol: "ibJPY+USDC",
+        symbolAlt: "ibJPY+USDC",
+        symbol: "ibJPY",
         shouldUseNewABI: true,
         decimals: 18,
         name: "Curve ibjpyusdc pool",
@@ -724,7 +730,8 @@ class Store {
       {
         address: IBKRWUSDC_ADDRESS,
         logoAddress: IBKRWUSDC_ADDRESS,
-        symbol: "ibKRW+USDC",
+        symbolAlt: "ibKRW+USDC",
+        symbol: "ibKRW",
         shouldUseNewABI: true,
         decimals: 18,
         name: "Curve ibkrwusdc pool",
@@ -752,7 +759,8 @@ class Store {
       {
         address: IBEUR_ADDRESS,
         logoAddress: IBEUR_POOL_ADDRESS,
-        symbol: "ibEUR+sEUR",
+        symbolAlt: "ibEUR+sEUR",
+        symbol: "ibEUR",
         decimals: 18,
         name: "Iron Bank EUR",
         oracleAddress: "0x00e5c0774A5F065c285068170b20393925C84BF3",
@@ -780,7 +788,8 @@ class Store {
       {
         address: IBKRW_ADDRESS,
         logoAddress: IBKRW_POOL_ADDRESS,
-        symbol: "ibKRW+sKRW",
+        symbolAlt: "ibKRW+sKRW",
+        symbol: "ibKRW",
         decimals: 18,
         name: "Iron Bank KRW",
         oracleAddress: "0x3c9f5385c288cE438Ed55620938A4B967c080101",
@@ -808,7 +817,8 @@ class Store {
       {
         address: IBGBP_ADDRESS,
         logoAddress: IBGBP_POOL_ADDRESS,
-        symbol: "ibGBP+sGBP",
+        symbolAlt: "ibGBP+sGBP",
+        symbol: "ibGBP",
         decimals: 18,
         name: "Iron Bank GBP",
         oracleAddress: "0xecaB2C76f1A8359A06fAB5fA0CEea51280A97eCF",
@@ -836,7 +846,8 @@ class Store {
       {
         address: IBCHF_ADDRESS,
         logoAddress: IBCHF_POOL_ADDRESS,
-        symbol: "ibCHF+sCHF",
+        symbolAlt: "ibCHF+sCHF",
+        symbol: "ibCHF",
         decimals: 18,
         name: "Iron Bank CHF",
         oracleAddress: "0x1b3E95E8ECF7A7caB6c4De1b344F94865aBD12d5",
@@ -864,7 +875,8 @@ class Store {
       {
         address: IBAUD_ADDRESS,
         logoAddress: IBAUD_POOL_ADDRESS,
-        symbol: "ibAUD+sAUD",
+        symbolAlt: "ibAUD+sAUD",
+        symbol: "ibAUD",
         decimals: 18,
         name: "Iron Bank AUD",
         oracleAddress: "0x86BBD9ac8B9B44C95FFc6BAAe58E25033B7548AA",
@@ -892,7 +904,8 @@ class Store {
       {
         address: IBJPY_ADDRESS,
         logoAddress: IBJPY_POOL_ADDRESS,
-        symbol: "ibJPY+sJPY",
+        symbolAlt: "ibJPY+sJPY",
+        symbol: "ibJPY",
         decimals: 18,
         name: "Iron Bank JPY",
         oracleAddress: "0x215F34af6557A6598DbdA9aa11cc556F5AE264B1",
@@ -920,7 +933,8 @@ class Store {
       {
         address: IBEUR_AG_ADDRESS,
         logoAddress: IBEUR_POOL_ADDRESS,
-        symbol: "ibEUR+agEUR",
+        symbolAlt: "ibEUR+agEUR",
+        symbol: "ibEUR",
         decimals: 18,
         name: "Iron Bank EUR",
         oracleAddress: "0x00e5c0774A5F065c285068170b20393925C84BF3",