From 66eaa118d8c72544daa1c38c3247d41376dec092 Mon Sep 17 00:00:00 2001 From: Jay Daraniya <40439741+JAYDARANIYA@users.noreply.github.com> Date: Wed, 31 Jul 2024 12:56:14 +0530 Subject: [PATCH 01/11] chore: Update market addresses in marketsConfig --- src/ui-config/marketsConfig.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index e8fb4653..3c201841 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -68,12 +68,12 @@ export const marketsData: { faucet: false, }, addresses: { - LENDING_POOL_ADDRESS_PROVIDER: '0x5e580E0FF1981E7c916D6D9a036A8596E35fCE31'.toLowerCase(), - LENDING_POOL: '0x837286C1d05735448F7d1942144eE98602206773', - WALLET_BALANCE_PROVIDER: '0xAE0f454b171dA3C0e3B8a75c92A449964f90f7fd', - UI_POOL_DATA_PROVIDER: '0xA69C04756c604b63514cBF13466eCE70a5BF755b', - UI_INCENTIVE_DATA_PROVIDER: '0xdfe6cC78B0A1ed393246B9151c83036AD3e165b8', - WETH_GATEWAY: '0x2ae2308F17667980582c6580556317EBdb61cc68', + LENDING_POOL_ADDRESS_PROVIDER: '0x5A90D4B8E220f3cacd8686Cc8c928340c7976075'.toLowerCase(), + LENDING_POOL: '0xc5982D12BbEDD00B95BF7514799CFb468F2BbB02', + WALLET_BALANCE_PROVIDER: '0x55730C557273fD92cA99D8275aeBb439cb3559AC', + UI_POOL_DATA_PROVIDER: '0xE626Df001cD56e0Fce27cBb29FD4aDEF4d1C95D9', + UI_INCENTIVE_DATA_PROVIDER: '0xf0cB9AF57Ce54760Ce3F95789AE4D2D3133289d2', + WETH_GATEWAY: '0x3D9a3e55e354647bbf63Aac7c30744e0a704e35e', }, faucetUrl: 'https://faucet.plend.finance/receiveFaucetTokens', }, From a75f9c3bb4769eef3a3ae6d260da6d6c483ed75b Mon Sep 17 00:00:00 2001 From: Jay Daraniya <40439741+JAYDARANIYA@users.noreply.github.com> Date: Wed, 31 Jul 2024 13:43:31 +0530 Subject: [PATCH 02/11] chore: Remove unused code and comments --- src/store/root.ts | 32 ++++++++++++++++---------------- src/ui-config/networksConfig.ts | 3 +-- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/store/root.ts b/src/store/root.ts index 42fdbab5..c8677443 100644 --- a/src/store/root.ts +++ b/src/store/root.ts @@ -1,4 +1,4 @@ -import { V3FaucetService } from '@aave/contract-helpers'; +// import { V3FaucetService } from '@aave/contract-helpers'; import { enableMapSet } from 'immer'; import { CustomMarket } from 'src/ui-config/marketsConfig'; import { ENABLE_TESTNET, STAGING_ENV } from 'src/utils/marketsAndNetworksConfig'; @@ -87,11 +87,11 @@ export const useGovernanceDataSubscription = createSingletonSubscriber(() => { return useRootStore.getState().refreshGovernanceData(); }, 60000); -let latest: V3FaucetService; +// let latest: V3FaucetService; useRootStore.subscribe( (state) => state.currentMarketData, async (selected) => { - const { setIsFaucetPermissioned: setFaucetPermissioned, jsonRpcProvider } = + const { setIsFaucetPermissioned: setFaucetPermissioned } = useRootStore.getState(); if (ENABLE_TESTNET || STAGING_ENV) { if (!selected.v3) { @@ -102,19 +102,19 @@ useRootStore.subscribe( // If there are multiple calls in flight, we only want to use the result from the latest one. // Use the instance of the service to check if it's the latest one since it is recreated // everytime this subscription fires. - const service = new V3FaucetService(jsonRpcProvider(), selected.addresses.FAUCET); - latest = service; - service - .isPermissioned() - .then((isPermissioned) => { - if (latest === service) { - setFaucetPermissioned(isPermissioned); - } - }) - .catch((e) => { - console.error('error checking faucet permission', e); - setFaucetPermissioned(false); - }); + // const service = new V3FaucetService(jsonRpcProvider(), selected.addresses.FAUCET); + // latest = service; + // service + // .isPermissioned() + // .then((isPermissioned) => { + // if (latest === service) { + // setFaucetPermissioned(isPermissioned); + // } + // }) + // .catch((e) => { + // console.error('error checking faucet permission', e); + // setFaucetPermissioned(false); + // }); } else { setFaucetPermissioned(false); } diff --git a/src/ui-config/networksConfig.ts b/src/ui-config/networksConfig.ts index 5f4d1406..60a1c9b8 100644 --- a/src/ui-config/networksConfig.ts +++ b/src/ui-config/networksConfig.ts @@ -84,13 +84,12 @@ export const networkConfigs: Record = { name: 'Etherlink Testnet', publicJsonRPCUrl: [ 'https://node.ghostnet.etherlink.com', - 'https://etherlink-ghostnet-6lcp5r.zeeve.net/rpc', ], baseUniswapAdapter: '0x0', baseAssetSymbol: 'XTZ', wrappedBaseAssetSymbol: 'WXTZ', baseAssetDecimals: 18, - explorerLink: 'https://testnet-explorer.etherlink.com', + explorerLink: 'https://testnet.explorer.etherlink.com', isTestnet: true, networkLogoPath: '/icons/networks/etherlink.svg', }, From 7b6de8da60280baea53470045c36bc59b99ec315 Mon Sep 17 00:00:00 2001 From: Jay Daraniya <40439741+JAYDARANIYA@users.noreply.github.com> Date: Wed, 31 Jul 2024 14:09:22 +0530 Subject: [PATCH 03/11] feat: Remove swap button --- .../lists/SupplyAssetsList/SupplyAssetsListItem.tsx | 9 ++++----- .../SupplyAssetsList/SupplyAssetsListMobileItem.tsx | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx b/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx index f8954811..e36f38ef 100644 --- a/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx +++ b/src/modules/dashboard/lists/SupplyAssetsList/SupplyAssetsListItem.tsx @@ -28,11 +28,10 @@ export const SupplyAssetsListItem = ({ isActive, isFreezed, detailsAddress, - showSwap, hideSupply, }: DashboardReserve) => { const { currentMarket } = useProtocolDataContext(); - const { openSupply, openPSMSwap } = useModalContext(); + const { openSupply } = useModalContext(); // Hide the asset to prevent it from being supplied if supply cap has been reached const { supplyCap: supplyCapUsage } = useAssetCaps(); @@ -85,12 +84,12 @@ export const SupplyAssetsListItem = ({ Deposit )} - {showSwap && ( + {/* {showSwap && ( - )} - {!(showSwap && !hideSupply) && ( + )} */} + {!hideSupply && ( )} - {showSwap && ( + {/* {showSwap && ( - )} - {!(showSwap && !hideSupply) && ( + )} */} + {!hideSupply && ( - - )} - + setMobileMenuOpen(false)} + > + An SVG of the Plend logo + + + {ENABLE_TESTNET && ( + + + + )} + + diff --git a/src/styles/variables.css b/src/styles/variables.css index 58ab0ec0..f6db8daf 100644 --- a/src/styles/variables.css +++ b/src/styles/variables.css @@ -1,3 +1,14 @@ body { --wcm-z-index: 1300; + padding: 0 !important; +} + +.truncate { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.shrink-0 { + flex-shrink: 0; } \ No newline at end of file From 4ebe13214a655e620fb4eda91f6b9a6f70db9bdc Mon Sep 17 00:00:00 2001 From: Jay Daraniya <40439741+JAYDARANIYA@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:22:23 +0530 Subject: [PATCH 10/11] Rebrand superlend market --- src/ui-config/marketsConfig.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index 2f485e2e..918dc1cd 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -68,12 +68,12 @@ export const marketsData: { faucet: false, }, addresses: { - LENDING_POOL_ADDRESS_PROVIDER: '0x5A90D4B8E220f3cacd8686Cc8c928340c7976075'.toLowerCase(), - LENDING_POOL: '0xc5982D12BbEDD00B95BF7514799CFb468F2BbB02', - WALLET_BALANCE_PROVIDER: '0x55730C557273fD92cA99D8275aeBb439cb3559AC', - UI_POOL_DATA_PROVIDER: '0xE626Df001cD56e0Fce27cBb29FD4aDEF4d1C95D9', - UI_INCENTIVE_DATA_PROVIDER: '0xf0cB9AF57Ce54760Ce3F95789AE4D2D3133289d2', - WETH_GATEWAY: '0x3D9a3e55e354647bbf63Aac7c30744e0a704e35e', + LENDING_POOL_ADDRESS_PROVIDER: '0x171A93836687ceE2892c7185B03391187a3f5a55'.toLowerCase(), + LENDING_POOL: '0x9a9fA5B9F1b98585235D040cb30BfFd3734A5d9b', + WALLET_BALANCE_PROVIDER: '0x6cAec669dB4C5f548A147B50c01f85696F71Ecbb', + UI_POOL_DATA_PROVIDER: '0x93E1497Bf67e89C9a7bdB6128cc98533B8627637', + UI_INCENTIVE_DATA_PROVIDER: '0xdf56fB6a781413D6Bd8309C7a630A4d57bC74c44', + WETH_GATEWAY: '0xb92A8614C5463948D75401910f84D7E8bA076140', COLLECTOR: '0x250fB04547404729D22Eb8f9C498Da13E9980f2D', }, faucetUrl: 'https://faucet.etherlink.com', From c05a93044429fe48ef2e7b147e7cce40ff5daa6b Mon Sep 17 00:00:00 2001 From: Jay Daraniya <40439741+JAYDARANIYA@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:25:55 +0530 Subject: [PATCH 11/11] rebrand superlend markets change --- pages/404.page.tsx | 4 +- pages/500.page.tsx | 4 +- {unused-pages => pages}/faucet.page.tsx | 0 {unused-pages => pages}/staking.staking.tsx | 0 {unused-pages => pages}/v3-migration.page.tsx | 0 src/layouts/AppHeader.tsx | 73 +++++++++---------- src/styles/variables.css | 11 --- src/ui-config/marketsConfig.tsx | 2 +- 8 files changed, 38 insertions(+), 56 deletions(-) rename {unused-pages => pages}/faucet.page.tsx (100%) rename {unused-pages => pages}/staking.staking.tsx (100%) rename {unused-pages => pages}/v3-migration.page.tsx (100%) diff --git a/pages/404.page.tsx b/pages/404.page.tsx index b61c0b4d..f9424f11 100644 --- a/pages/404.page.tsx +++ b/pages/404.page.tsx @@ -2,7 +2,7 @@ import { Trans } from '@lingui/macro'; import { Box, Button, Paper, Typography, useTheme } from '@mui/material'; import Link from 'next/link'; import { ContentContainer } from 'src/components/ContentContainer'; -// import { TopInfoPanel } from 'src/components/TopInfoPanel/TopInfoPanel'; +import { TopInfoPanel } from 'src/components/TopInfoPanel/TopInfoPanel'; import { MainLayout } from 'src/layouts/MainLayout'; export default function Aave404Page() { @@ -10,7 +10,7 @@ export default function Aave404Page() { return ( <> - {/* */} + - {/* */} + - setMobileMenuOpen(false)} > - setMobileMenuOpen(false)} - > - An SVG of the Plend logo - - - {ENABLE_TESTNET && ( - - - - )} - - + An SVG of the Plend logo + + + {ENABLE_TESTNET && ( + + + + )} + diff --git a/src/styles/variables.css b/src/styles/variables.css index f6db8daf..58ab0ec0 100644 --- a/src/styles/variables.css +++ b/src/styles/variables.css @@ -1,14 +1,3 @@ body { --wcm-z-index: 1300; - padding: 0 !important; -} - -.truncate { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.shrink-0 { - flex-shrink: 0; } \ No newline at end of file diff --git a/src/ui-config/marketsConfig.tsx b/src/ui-config/marketsConfig.tsx index 918dc1cd..c54a1dd9 100644 --- a/src/ui-config/marketsConfig.tsx +++ b/src/ui-config/marketsConfig.tsx @@ -78,4 +78,4 @@ export const marketsData: { }, faucetUrl: 'https://faucet.etherlink.com', }, -} as const; +} as const; \ No newline at end of file