Merge branch 'master' into fuse-flywheel

Rari-Capital · Sep 25, 2021 · 53f55ba · 53f55ba · github-actions · Sep 25, 2021
2 parents c3b45ec + d8529d4
commit 53f55ba
Show file tree

Hide file tree

Showing 33 changed files with 22 additions and 16 deletions.
diff --git a/api/tokenData.ts b/api/tokenData.ts
@@ -39,14 +39,15 @@ export default async (request: VercelRequest, response: VercelResponse) => {
     //////////////////
     // Edge cases: //
     /////////////////
+
     if (
       web3.utils.toChecksumAddress(address) ===
       web3.utils.toChecksumAddress("0xFD4D8a17df4C27c1dD245d153ccf4499e806C87D")
     ) {
       name = "linkCRV Gauge Deposit";
       symbol = "[G]linkCRV";
       logoURL =
-        "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/crvLINKGauge.png";
+        "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/tokens/crvLINKGauge.png";
     }
 
     if (
@@ -55,15 +56,20 @@ export default async (request: VercelRequest, response: VercelResponse) => {
     ) {
       name = "Wrapped Staked Ether";
       logoURL =
-        "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/wstETH.png";
+        "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/tokens/wstETH.png";
     }
 
     if (
       web3.utils.toChecksumAddress(address) ===
       web3.utils.toChecksumAddress("0x04f2694c8fcee23e8fd0dfea1d4f5bb8c352111f")
     ) {
       logoURL =
-        "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/token_sOHM_2.png";
+        "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/tokens/sOHM.png";
+    }
+
+    if (symbol === "G-UNI") {
+      logoURL =
+        "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/tokens/G-UNI.png";
     }
 
     // Fetch the logo from yearn if possible:
@@ -130,7 +136,7 @@ export default async (request: VercelRequest, response: VercelResponse) => {
     web3.utils.toChecksumAddress("0xaC14864ce5A98aF3248Ffbf549441b04421247D3")
   ) {
     logoURL =
-      "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/logos/stakedao/xSDT.png";
+      "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/xSDT.png";
   }
 
   // sd3Crv
@@ -139,7 +145,7 @@ export default async (request: VercelRequest, response: VercelResponse) => {
     web3.utils.toChecksumAddress("0xB17640796e4c27a39AF51887aff3F8DC0daF9567")
   ) {
     logoURL =
-      "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/logos/stakedao/sd3Crv.png";
+      "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/sd3Crv.png";
   }
 
   // sdeursCRV
@@ -148,7 +154,7 @@ export default async (request: VercelRequest, response: VercelResponse) => {
     web3.utils.toChecksumAddress("0xCD6997334867728ba14d7922f72c893fcee70e84")
   ) {
     logoURL =
-      "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/logos/stakedao/sdeursCRV.png";
+      "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/sdeursCRV.png";
   }
 
   const basicTokenInfo = {

diff --git a/src/components/shared/Logos.tsx b/src/components/shared/Logos.tsx
@@ -8,16 +8,16 @@ import Logo from "../../static/small-logo.png";
 import FuseLogo from "../../static/fuseicon.png";
 import TransparentLogo from "../../static/small-transparent-logo.png";
 
-import StatsPNGWhite from "static/icons/stats.png";
-import StatsPNGGreen from "static/icons/statsGreen.png";
-import EarnPNGWhite from "static/icons/earn.png";
-import EarnPNGGreen from "static/icons/earnGreen.png";
-import FusePNGWhite from "static/icons/fuse.png";
-import FusePNGGreen from "static/icons/fuseGreen.png";
-import Pool2PNGWhite from "static/icons/pool2.png";
-import Pool2PNGGreen from "static/icons/pool2Green.png";
-import TranchesPNGWhite from "static/icons/tranches.png";
-import TranchesPNGGreen from "static/icons/tranchesGreen.png";
+import StatsPNGWhite from "static/positionsIcons/stats.png";
+import StatsPNGGreen from "static/positionsIcons/statsGreen.png";
+import EarnPNGWhite from "static/positionsIcons/earn.png";
+import EarnPNGGreen from "static/positionsIcons/earnGreen.png";
+import FusePNGWhite from "static/positionsIcons/fuse.png";
+import FusePNGGreen from "static/positionsIcons/fuseGreen.png";
+import Pool2PNGWhite from "static/positionsIcons/pool2.png";
+import Pool2PNGGreen from "static/positionsIcons/pool2Green.png";
+import TranchesPNGWhite from "static/positionsIcons/tranches.png";
+import TranchesPNGGreen from "static/positionsIcons/tranchesGreen.png";
 
 import { usePoolInfoFromContext } from "../../hooks/usePoolInfo";
 

diff --git a/src/static/icons/earn.png → src/static/positionsIcons/earn.png b/src/static/icons/earn.png → src/static/positionsIcons/earn.png
diff --git a/src/static/icons/earn.svg → src/static/positionsIcons/earn.svg b/src/static/icons/earn.svg → src/static/positionsIcons/earn.svg
diff --git a/src/static/icons/earnGreen.png → src/static/positionsIcons/earnGreen.png b/src/static/icons/earnGreen.png → src/static/positionsIcons/earnGreen.png
diff --git a/src/static/icons/earnGreen.svg → src/static/positionsIcons/earnGreen.svg b/src/static/icons/earnGreen.svg → src/static/positionsIcons/earnGreen.svg
diff --git a/src/static/icons/fuse.png → src/static/positionsIcons/fuse.png b/src/static/icons/fuse.png → src/static/positionsIcons/fuse.png
diff --git a/src/static/icons/fuse.svg → src/static/positionsIcons/fuse.svg b/src/static/icons/fuse.svg → src/static/positionsIcons/fuse.svg
diff --git a/src/static/icons/fuseGreen.png → src/static/positionsIcons/fuseGreen.png b/src/static/icons/fuseGreen.png → src/static/positionsIcons/fuseGreen.png
diff --git a/src/static/icons/fuseGreen.svg → src/static/positionsIcons/fuseGreen.svg b/src/static/icons/fuseGreen.svg → src/static/positionsIcons/fuseGreen.svg
diff --git a/src/static/icons/pool2.png → src/static/positionsIcons/pool2.png b/src/static/icons/pool2.png → src/static/positionsIcons/pool2.png
diff --git a/src/static/icons/pool2.svg → src/static/positionsIcons/pool2.svg b/src/static/icons/pool2.svg → src/static/positionsIcons/pool2.svg
diff --git a/src/static/icons/pool2Green.png → src/static/positionsIcons/pool2Green.png b/src/static/icons/pool2Green.png → src/static/positionsIcons/pool2Green.png
diff --git a/src/static/icons/pool2Green.svg → src/static/positionsIcons/pool2Green.svg b/src/static/icons/pool2Green.svg → src/static/positionsIcons/pool2Green.svg
diff --git a/src/static/icons/stats.png → src/static/positionsIcons/stats.png b/src/static/icons/stats.png → src/static/positionsIcons/stats.png
diff --git a/src/static/icons/stats.svg → src/static/positionsIcons/stats.svg b/src/static/icons/stats.svg → src/static/positionsIcons/stats.svg
diff --git a/src/static/icons/statsGreen.png → src/static/positionsIcons/statsGreen.png b/src/static/icons/statsGreen.png → src/static/positionsIcons/statsGreen.png
diff --git a/src/static/icons/statsGreen.svg → src/static/positionsIcons/statsGreen.svg b/src/static/icons/statsGreen.svg → src/static/positionsIcons/statsGreen.svg
diff --git a/src/static/icons/tranche.svg → src/static/positionsIcons/tranche.svg b/src/static/icons/tranche.svg → src/static/positionsIcons/tranche.svg
diff --git a/src/static/icons/trancheGreen.svg → src/static/positionsIcons/trancheGreen.svg b/src/static/icons/trancheGreen.svg → src/static/positionsIcons/trancheGreen.svg
diff --git a/src/static/icons/tranches.png → src/static/positionsIcons/tranches.png b/src/static/icons/tranches.png → src/static/positionsIcons/tranches.png
diff --git a/src/static/icons/tranchesGreen.png → src/static/positionsIcons/tranchesGreen.png b/src/static/icons/tranchesGreen.png → src/static/positionsIcons/tranchesGreen.png
diff --git a/src/static/sOHM.png b/src/static/sOHM.png
diff --git a/src/static/tokens/G-UNI.png b/src/static/tokens/G-UNI.png
diff --git a/src/static/crvLINKGauge.png → src/static/tokens/crvLINKGauge.png b/src/static/crvLINKGauge.png → src/static/tokens/crvLINKGauge.png
diff --git a/src/static/token_sOHM_2.png → src/static/tokens/sOHM.png b/src/static/token_sOHM_2.png → src/static/tokens/sOHM.png
diff --git a/src/static/logos/stakedao/sd3Crv.png → src/static/tokens/sd3Crv.png b/src/static/logos/stakedao/sd3Crv.png → src/static/tokens/sd3Crv.png
diff --git a/src/static/logos/stakedao/sd3CrvRound.png → src/static/tokens/sd3CrvRound.png b/src/static/logos/stakedao/sd3CrvRound.png → src/static/tokens/sd3CrvRound.png
diff --git a/src/static/logos/stakedao/sdeursCRV.png → src/static/tokens/sdeursCRV.png b/src/static/logos/stakedao/sdeursCRV.png → src/static/tokens/sdeursCRV.png
diff --git a/src/static/logos/stakedao/sdeursCRVRound.png → src/static/tokens/sdeursCRVRound.png b/src/static/logos/stakedao/sdeursCRVRound.png → src/static/tokens/sdeursCRVRound.png
diff --git a/src/static/wstETH.png → src/static/tokens/wstETH.png b/src/static/wstETH.png → src/static/tokens/wstETH.png
diff --git a/src/static/logos/stakedao/xSDT.png → src/static/tokens/xSDT.png b/src/static/logos/stakedao/xSDT.png → src/static/tokens/xSDT.png
diff --git a/src/static/logos/stakedao/xSDTRound.png → src/static/tokens/xSDTRound.png b/src/static/logos/stakedao/xSDTRound.png → src/static/tokens/xSDTRound.png