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/28] 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/28] 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/28] 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/28] 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/28] 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 From ad1da3a98b78050060afdc1c55d16fb5c5b20c01 Mon Sep 17 00:00:00 2001 From: shreyaspangal Date: Tue, 13 Aug 2024 12:24:46 +0530 Subject: [PATCH 12/28] ui: theme changes --- package.json | 3 +- public/logos/superlend-full-logo.webp | Bin 0 -> 15958 bytes public/logos/superlend-full-svg.svg | 5 ++ public/logos/superlendlogo.webp | Bin 0 -> 890 bytes src/components/ConnectWalletPaper.tsx | 29 +++++------ src/components/HealthFactorNumber.tsx | 2 +- src/components/MarketSwitcher.tsx | 4 +- src/components/ReserveOverviewBox.tsx | 2 +- src/components/StyledToggleButton.tsx | 14 +++--- .../TopInfoPanel/TopInfoPanelItem.tsx | 7 ++- src/components/caps/CapsCircularStatus.tsx | 2 +- src/components/primitives/FormattedNumber.tsx | 10 ++-- src/components/transactions/AssetInput.tsx | 2 + .../transactions/Emode/EmodeModalContent.tsx | 2 +- src/layouts/MobileMenu.tsx | 10 ++-- src/layouts/MoreMenu.tsx | 5 +- src/layouts/SettingsMenu.tsx | 7 +-- src/layouts/WalletWidget.tsx | 15 +++--- src/layouts/components/DarkModeSwitcher.tsx | 2 +- src/layouts/components/DrawerWrapper.tsx | 6 ++- src/layouts/components/LanguageSwitcher.tsx | 12 ++--- src/layouts/components/NavItems.tsx | 6 +-- .../components/TestNetModeSwitcher.tsx | 2 +- .../dashboard/DashboardEModeButton.tsx | 14 +++--- src/modules/dashboard/DashboardTopPanel.tsx | 12 +++-- .../SupplyAssetsList/SupplyAssetsListItem.tsx | 14 +++--- .../SupplyAssetsListMobileItem.tsx | 10 ++-- .../reserve-overview/ReserveTopDetails.tsx | 6 +-- src/uiConfig.ts | 2 +- src/utils/theme.tsx | 47 +++++++++++------- 30 files changed, 143 insertions(+), 109 deletions(-) create mode 100644 public/logos/superlend-full-logo.webp create mode 100644 public/logos/superlend-full-svg.svg create mode 100644 public/logos/superlendlogo.webp diff --git a/package.json b/package.json index 9b3a456a..4de12ae2 100644 --- a/package.json +++ b/package.json @@ -152,5 +152,6 @@ "budget": null, "budgetPercentIncreaseRed": 20, "showDetails": true - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/public/logos/superlend-full-logo.webp b/public/logos/superlend-full-logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..d3e255e33d5d1c71f87e273208b58595188360b2 GIT binary patch literal 15958 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 + + + + diff --git a/public/logos/superlendlogo.webp b/public/logos/superlendlogo.webp new file mode 100644 index 0000000000000000000000000000000000000000..dd02ee48d0a57569d5515310a3af57829106954f GIT binary patch literal 890 zcmV-=1BLujNk&F;0{{S5MM6+kP&il$0000G0000-002J#06|PpNCN`^00EFFNwR5M zbB$-)wr$(CZQHhO+qP|7-=pB4PqaHBprzV+DQQT83JQI_!+ea%NE}N{0d25oCfh^nPg=LXG2{?lzPS+ zmGPu=I^bWq^${gmD;q{yV?F@wkI*WCV1=}T&b zX<#*I&B9Uc0wPLQZDoMyXKhk!0}fcljt~rSBlT!G%C_n=;Qt0ONwpBTZ`G2ab0Qg@ z6nwKffZCGjaRFPs2TREKc)(%BFqL^J!CQrUWPTZNTOrg2y})4wXAJY^fu&YIt+=y! z_d#c?Bj9mH({eK`U^No(v#Rb!`K$sV-d2g;1LhlhcNlz=;R=Ft1vagOqTjbyh&!Un z4qG)RX?v%QmXf^kGu!Npu0Sad*~2l$oz!zL{b=0h)mcdl09H^qAV>fJ0FVLzodGIH z06+i$001SV00YTrnA2!|icNOq7XSeM|DN&x|LK7L|N374|NrT9zyfRk|I+D_zx(Gk QKmY%}aesgJ$`Akm0Ap^P&j0`b literal 0 HcmV?d00001 diff --git a/src/components/ConnectWalletPaper.tsx b/src/components/ConnectWalletPaper.tsx index acde2282..d8255f07 100644 --- a/src/components/ConnectWalletPaper.tsx +++ b/src/components/ConnectWalletPaper.tsx @@ -3,6 +3,7 @@ import { Box, CircularProgress, Paper, PaperProps, Typography, useTheme } from ' import { ReactNode } from 'react'; import WalletConnectLogoDark from '/public/walletConnectLogoDark.svg'; +import FullLogo from '/public/logos/superlend-full-svg.svg'; import MarkedList from './lists/MarkedList'; import MarkedListItem from './lists/MarkedListItem'; @@ -34,22 +35,18 @@ export const ConnectWalletPaper = ({ ...sx, }} > - {theme.palette.mode === 'light' ? ( - - - - ) : ( - - )} + + + {loading ? ( diff --git a/src/components/HealthFactorNumber.tsx b/src/components/HealthFactorNumber.tsx index 2de3dba4..7e9cacdd 100644 --- a/src/components/HealthFactorNumber.tsx +++ b/src/components/HealthFactorNumber.tsx @@ -56,7 +56,7 @@ export const HealthFactorNumber = ({ {onInfoClick && ( )} - + @@ -311,7 +311,7 @@ export default function WalletWidget({ open, setOpen, headerHeight }: WalletWidg - + - + )} diff --git a/src/components/Warnings/BorrowDisabledWarning.tsx b/src/components/Warnings/BorrowDisabledWarning.tsx index 87bd0bae..5c05a081 100644 --- a/src/components/Warnings/BorrowDisabledWarning.tsx +++ b/src/components/Warnings/BorrowDisabledWarning.tsx @@ -10,7 +10,7 @@ interface BorrowDisabledWarningProps { export const BorrowDisabledWarning = ({ symbol, currentMarket }: BorrowDisabledWarningProps) => { return ( - Borrowing is disabled due to an Plend community decision.{' '} + Borrowing is disabled due to an Superlend community decision.{' '} { return ( - To continue, you need to grant Plend smart contracts permission to move your funds from your + To continue, you need to grant Superlend smart contracts permission to move your funds from your wallet. Depending on the asset and wallet you use, it is done by signing the permission message (gas free), or by submitting an approval transaction (requires gas).{' '} diff --git a/src/components/infoTooltips/FrozenTooltip.tsx b/src/components/infoTooltips/FrozenTooltip.tsx index 67c449cb..2aa6ce96 100644 --- a/src/components/infoTooltips/FrozenTooltip.tsx +++ b/src/components/infoTooltips/FrozenTooltip.tsx @@ -25,7 +25,7 @@ export const FrozenTooltip = ({ symbol, currentMarket }: FrozenTooltipProps) => tooltipContent={ - This asset is frozen due to Plend Protocol decision.{' '} + This asset is frozen due to Superlend Protocol decision.{' '} { return ( - Read-only mode allows to see address positions in Plend, but you won't be able to + Read-only mode allows to see address positions in Superlend, but you won't be able to perform transactions. diff --git a/src/components/infoTooltips/RenFILToolTip.tsx b/src/components/infoTooltips/RenFILToolTip.tsx index f5052c73..e4b43f21 100644 --- a/src/components/infoTooltips/RenFILToolTip.tsx +++ b/src/components/infoTooltips/RenFILToolTip.tsx @@ -11,7 +11,7 @@ export const RenFILToolTip = () => { tooltipContent={ - This asset is frozen due to Plend Protocol decision{' '} + This asset is frozen due to Superlend Protocol decision{' '} More details diff --git a/src/components/infoTooltips/ReserveFactorTooltip.tsx b/src/components/infoTooltips/ReserveFactorTooltip.tsx index e4183030..60dd624a 100644 --- a/src/components/infoTooltips/ReserveFactorTooltip.tsx +++ b/src/components/infoTooltips/ReserveFactorTooltip.tsx @@ -15,7 +15,7 @@ export const ReserveFactorTooltip = ({ collectorLink, ...rest }: ReserveFactorTo ) : ( 'collector contract' )}{' '} - that is controlled by Plend governance to promote ecosystem growth.{' '} + that is controlled by Superlend governance to promote ecosystem growth.{' '} ); diff --git a/src/components/transactions/FlowCommons/Success.tsx b/src/components/transactions/FlowCommons/Success.tsx index d05f721e..fe0b321a 100644 --- a/src/components/transactions/FlowCommons/Success.tsx +++ b/src/components/transactions/FlowCommons/Success.tsx @@ -133,7 +133,7 @@ export const TxSuccessView = ({ Add{' '} - {addToken && addToken.aToken ? `p${addToken.symbol}` : `${addToken.symbol} token`}{' '} + {addToken && addToken.aToken ? `sl${addToken.symbol}` : `${addToken.symbol} token`}{' '} to wallet to track your balance. @@ -142,7 +142,7 @@ export const TxSuccessView = ({ addERC20Token({ address: addToken.address, decimals: addToken.decimals, - symbol: addToken.aToken ? `p${addToken.symbol}` : addToken.symbol, + symbol: addToken.aToken ? `sl${addToken.symbol}` : addToken.symbol, image: !/_/.test(addToken.symbol) ? base64 : undefined, }); }} diff --git a/src/components/transactions/MigrateV3/MigrateV3ModalContent.tsx b/src/components/transactions/MigrateV3/MigrateV3ModalContent.tsx index 0232e167..1262f227 100644 --- a/src/components/transactions/MigrateV3/MigrateV3ModalContent.tsx +++ b/src/components/transactions/MigrateV3/MigrateV3ModalContent.tsx @@ -72,7 +72,7 @@ export const MigrateV3ModalContent = () => { return ( <> - + {isWrongNetwork && !readOnlyModeAddress && ( )} diff --git a/src/layouts/AppHeader.tsx b/src/layouts/AppHeader.tsx index 6c0b13a3..5890fa67 100644 --- a/src/layouts/AppHeader.tsx +++ b/src/layouts/AppHeader.tsx @@ -116,7 +116,7 @@ export function AppHeader() { }} onClick={() => setMobileMenuOpen(false)} > - An SVG of the Plend logo + An SVG of the Superlend logo {ENABLE_TESTNET && ( diff --git a/src/layouts/MoreMenu.tsx b/src/layouts/MoreMenu.tsx index 78f614b1..0b1c49fd 100644 --- a/src/layouts/MoreMenu.tsx +++ b/src/layouts/MoreMenu.tsx @@ -59,7 +59,7 @@ export function MoreMenu() { open={open} onClose={handleClose} keepMounted={true} - sx={{'.MuiList-root.MuiMenu-list': { background: "#0F244B" }}} + // sx={{'.MuiList-root.MuiMenu-list': { background: "#0F244B" }}} > {moreNavigation.map((item, index) => ( diff --git a/src/layouts/WalletWidget.tsx b/src/layouts/WalletWidget.tsx index c0b48ff0..0a319ebe 100644 --- a/src/layouts/WalletWidget.tsx +++ b/src/layouts/WalletWidget.tsx @@ -442,7 +442,7 @@ export default function WalletWidget({ open, setOpen, headerHeight }: WalletWidg {md ? ( - + @@ -456,7 +456,7 @@ export default function WalletWidget({ open, setOpen, headerHeight }: WalletWidg open={open} onClose={handleClose} keepMounted={true} - sx={{'.MuiList-root.MuiMenu-list': { background: palette.mode === 'dark' ? "#0F244B" : "#f1f1f1" }}} + sx={{'.MuiList-root.MuiMenu-list': { background: palette.mode === 'dark' ? "#2A2826" : "#f1f1f1" }}} > diff --git a/src/modules/dashboard/DashboardEModeButton.tsx b/src/modules/dashboard/DashboardEModeButton.tsx index 7749a555..33c4c73e 100644 --- a/src/modules/dashboard/DashboardEModeButton.tsx +++ b/src/modules/dashboard/DashboardEModeButton.tsx @@ -127,7 +127,7 @@ export const DashboardEModeButton = ({ userEmodeCategoryId }: DashboardEModeButt diff --git a/src/modules/faucet/FaucetTopPanel.tsx b/src/modules/faucet/FaucetTopPanel.tsx index 3dfcbd69..2d08c798 100644 --- a/src/modules/faucet/FaucetTopPanel.tsx +++ b/src/modules/faucet/FaucetTopPanel.tsx @@ -23,7 +23,7 @@ export const FaucetTopPanel = () => { - With testnet Faucet you can get free assets to test the Plend Protocol. Make sure to + With testnet Faucet you can get free assets to test the Superlend Protocol. Make sure to switch your wallet provider to the appropriate testnet network, select desired asset, and click ‘Faucet’ to get tokens transferred to your wallet. The assets on a testnet are not “real,” meaning they have no monetary value.{' '} diff --git a/src/modules/markets/MarketAssetsListContainer.tsx b/src/modules/markets/MarketAssetsListContainer.tsx index 2c944aed..aa3cdddf 100644 --- a/src/modules/markets/MarketAssetsListContainer.tsx +++ b/src/modules/markets/MarketAssetsListContainer.tsx @@ -77,7 +77,7 @@ export const MarketAssetsListContainer = () => { - These assets are temporarily frozen by Plend Protocol decisions, meaning that further + These assets are temporarily frozen by Superlend Protocol decisions, meaning that further supply / borrow, or rate swap of these assets are unavailable. Withdrawals and debt repayments are allowed. diff --git a/src/modules/migration/MigrationBottomPanel.tsx b/src/modules/migration/MigrationBottomPanel.tsx index 484172c7..966bb1f9 100644 --- a/src/modules/migration/MigrationBottomPanel.tsx +++ b/src/modules/migration/MigrationBottomPanel.tsx @@ -192,7 +192,7 @@ export const MigrationBottomPanel = ({ Please always be aware of your Health Factor (HF) when partially migrating a - position and that your rates will be updated to Plend Protocol rates. + position and that your rates will be updated to Superlend Protocol rates. diff --git a/src/modules/migration/MigrationListItem.tsx b/src/modules/migration/MigrationListItem.tsx index 8096e97c..11488e7e 100644 --- a/src/modules/migration/MigrationListItem.tsx +++ b/src/modules/migration/MigrationListItem.tsx @@ -159,7 +159,7 @@ export const MigrationListItem = ({ {disabled !== undefined && ( diff --git a/src/modules/migration/MigrationListMobileItem.tsx b/src/modules/migration/MigrationListMobileItem.tsx index f4d9bc2e..6c47c589 100644 --- a/src/modules/migration/MigrationListMobileItem.tsx +++ b/src/modules/migration/MigrationListMobileItem.tsx @@ -130,7 +130,7 @@ export const MigrationListMobileItem = ({ {disabled !== undefined && ( diff --git a/src/modules/migration/USDCMigrationWarning.tsx b/src/modules/migration/USDCMigrationWarning.tsx index 744be481..2310fd11 100644 --- a/src/modules/migration/USDCMigrationWarning.tsx +++ b/src/modules/migration/USDCMigrationWarning.tsx @@ -12,7 +12,7 @@ export const USDCMigrationWarning: React.FC = () => { severity="error" > - Plend Protocol only supports DAI, so your USDC will be converted into DAI.{' '} + Superlend Protocol only supports DAI, so your USDC will be converted into DAI.{' '} ); diff --git a/src/modules/privacy-policy/PPContent.tsx b/src/modules/privacy-policy/PPContent.tsx index c2d035ff..8ba507ae 100644 --- a/src/modules/privacy-policy/PPContent.tsx +++ b/src/modules/privacy-policy/PPContent.tsx @@ -25,7 +25,7 @@ const PPContent = (): JSX.Element => { This privacy notice applies to you if (i) you access and/or use the website (the{' '} Website) and front-end provided by the Foundation to interact with the - Plend Protocol (the Front-End), including by connecting your digital assets + Superlend Protocol (the Front-End), including by connecting your digital assets wallet to the Front-End; (ii) your personal data has been provided to the Foundation by another person; or (iii) the Foundation otherwise uses your personal data. This privacy notice sets out the basis on which personal data about you will be processed by the diff --git a/src/modules/reserve-overview/AddTokenDropdown.tsx b/src/modules/reserve-overview/AddTokenDropdown.tsx index ade277e8..d67d4a37 100644 --- a/src/modules/reserve-overview/AddTokenDropdown.tsx +++ b/src/modules/reserve-overview/AddTokenDropdown.tsx @@ -147,7 +147,7 @@ export const AddTokenDropdown = ({ addERC20Token({ address: poolReserve.aTokenAddress, decimals: poolReserve.decimals, - symbol: `p${poolReserve.symbol}`, + symbol: `sl${poolReserve.symbol}`, image: !/_/.test(poolReserve.symbol) ? aTokenBase64 : undefined, }); } @@ -156,7 +156,7 @@ export const AddTokenDropdown = ({ > - {`p${poolReserve.symbol}`} + {`sl${poolReserve.symbol}`} diff --git a/src/modules/reserve-overview/ReserveConfiguration.tsx b/src/modules/reserve-overview/ReserveConfiguration.tsx index dd64c4b7..e97bb10a 100644 --- a/src/modules/reserve-overview/ReserveConfiguration.tsx +++ b/src/modules/reserve-overview/ReserveConfiguration.tsx @@ -74,7 +74,7 @@ export const ReserveConfiguration: React.FC = ({ rese {reserve.isFrozen ? ( - This asset is frozen due to an Plend community decision.{' '} + This asset is frozen due to an Superlend community decision.{' '} = ({ rese E-Mode increases your LTV for a selected category of assets, meaning that when E-mode is enabled, you will have higher borrowing power over assets of the same - E-mode category which are defined by Plend Governance. You can enter E-Mode from + E-mode category which are defined by Superlend Governance. You can enter E-Mode from your{' '} = ({ rese variant="caption" color="text.secondary" > - Plend Documentation + Superlend Documentation . diff --git a/src/modules/terms-of-service/TOSContent.tsx b/src/modules/terms-of-service/TOSContent.tsx index 5fee4766..ce4084af 100644 --- a/src/modules/terms-of-service/TOSContent.tsx +++ b/src/modules/terms-of-service/TOSContent.tsx @@ -60,16 +60,16 @@ const TOSContent = (): JSX.Element => { be at least eighteen years of age, of sound mental capacity and have all technical knowledge necessary or advisable to understand and evaluate the risks of the Site and - Plend; + Superlend; agree that the Site is provided for informational purposes only and is not directly or - indirectly in control of or capable of interacting with Etherlink Mainnet, Plend Altchains + indirectly in control of or capable of interacting with Etherlink Mainnet, PlSuperlendend Altchains and related Blockchain Systems or performing or effecting any transactions on your behalf; agree that the Site is only being provided as an aid to your own independent research and - evaluation of Plend and that no representation or warranty is being made as to the + evaluation of Superlend and that no representation or warranty is being made as to the accuracy or completeness of information on the Site; @@ -87,7 +87,7 @@ const TOSContent = (): JSX.Element => { not hold the Site Operator or any of its representatives or affiliates liable for any - damages you suffer in connection with your use of the Site or Plend; + damages you suffer in connection with your use of the Site or Superlend; waive your right to initiate or participate in class actions relating to the Site; and @@ -118,70 +118,70 @@ const TOSContent = (): JSX.Element => { the Etherlink Mainnet; - the Plend Smart Contract System, Plend Smart Contract Protocol, Plend Mainnet, and - Plend Altchains; + the Superlend Smart Contract System, Superlend Smart Contract Protocol, Superlend Mainnet, and + Superlend Altchains; tokens that exist and have been or may be made available for withdrawal or “borrowing” - by third parties known as “lenders” or “depositors” in connection with the Plend Smart + by third parties known as “lenders” or “depositors” in connection with the Superlend Smart Contract System; third-party smart contract systems that act as “borrowers” or “lenders” in - contract-to-contract (C2C) transactions of the Plend Smart Contract Systems; + contract-to-contract (C2C) transactions of the Superlend Smart Contract Systems; the implied or express fair market prices of tokens, which may be denominated in terms of other tokens; and - transaction records relating to the Plend Smart Contract System. + transaction records relating to the Superlend Smart Contract System. The Site also offers interaction methods whereby the User can indicate a transaction the - User would like to perform in connection with the Plend Smart Contract System (such as + User would like to perform in connection with the Superlend Smart Contract System (such as swapping one token for another). When used in this way, the Site can generate a draft transaction message which the User can independently use in conjunction with a third-party wallet application or device to - conduct transactions on Etherlink Mainnet or Plend Altchains. + conduct transactions on Etherlink Mainnet or Superlend Altchains. - About Plend + About Superlend - The Plend Smart Contract Protocol is software source code freely licensed to the public, + The Superlend Smart Contract Protocol is software source code freely licensed to the public, which provides a decentralized “credit” protocol through which tokens can be ‘loaned' - and ‘borrowed'. The Plend Smart Contract System is a copy of the Plend Smart Contract + and ‘borrowed'. The Superlend Smart Contract System is a copy of the Superlend Smart Contract Protocol that has been compiled to bytecode and permanently associated with one or more - specific public addresses on Etherlink Mainnet and Plend Altchains. Through a compatible + specific public addresses on Etherlink Mainnet and Superlend Altchains. Through a compatible third-party wallet application or device, Etherlink Mainnet Node or node compatible with - a Plend Altchain, as applicable, any User may pay Etherlink Mainnet Validators or other + a Superlend Altchain, as applicable, any User may pay Etherlink Mainnet Validators or other validators on the appropriate Blockchain System to operate and record the results of the - Plend Smart Contract System in accordance with the User's instructions, thus + Superlend Smart Contract System in accordance with the User's instructions, thus effectuating token transactions. - Relationship to Plend Smart Contract System + Relationship to Superlend Smart Contract System - Using Plend Mainnet, Plend Altchains, Etherlink Mainnet, or the Plend Smart Contract + Using Superlend Mainnet, Superlend Altchains, Etherlink Mainnet, or the Superlend Smart Contract System does not require use of the Site. The Site aggregates and publishes publicly - available information about the Plend Smart Contract System in a user- friendly and + available information about the Superlend Smart Contract System in a user- friendly and convenient format. Such information is also independently available from other sources—for example, a person may directly review transaction history, account balances - and the Plend Smart Contract System on a compatible block explorer for Etherlink Mainnet - or a Plend Altchain. + and the Superlend Smart Contract System on a compatible block explorer for Etherlink Mainnet + or a Superlend Altchain. By combining publicly available information with the User's interactions with the Site, - the Site can draft standard transaction messages compatible with the Plend Smart + the Site can draft standard transaction messages compatible with the Superlend Smart Contract System which are designed to accomplish the User's operational goals as expressed through the interactions. If the User so wishes, the User may broadcast such messages in order to initiate token transactions. @@ -190,12 +190,12 @@ const TOSContent = (): JSX.Element => { All draft transaction messages are delivered by the Site via API to a compatible third-party wallet application or device selected by the User after pressing the “Connect Wallet” (or similar) button on the Site. The User must personally review and - authorize all transaction messages that the User wishes to send to Plend Mainnet, Plend + authorize all transaction messages that the User wishes to send to Superlend Mainnet, Superlend Altchains or other blockchain systems; this requires the User to sign the relevant transaction message with a private cryptographic key inaccessible to the Site. The User- authorized message will then be broadcast to Validators through the wallet application or device and the User may pay a network fee to have the Validators apply the - transaction message to the Plend Smart Contract System and record the results on the + transaction message to the Superlend Smart Contract System and record the results on the appropriate blockchain—resulting in a token transaction being completed on that blockchain. @@ -204,7 +204,7 @@ const TOSContent = (): JSX.Element => { store or have access to or control over any tokens, private keys, passwords, accounts or other property of the User, and are not capable of performing transactions or sending transaction messages on behalf of the User. The Site does not hold and cannot purchase, - sell or trade any tokens. All transactions relating to the Plend Smart Contract System + sell or trade any tokens. All transactions relating to the Superlend Smart Contract System are effected and recorded solely through the interactions of the User with the respective Validators, who are not under the control of or affiliated with the Site Operator or the Site. @@ -217,7 +217,7 @@ const TOSContent = (): JSX.Element => { Important disclaimers and disclosures regarding the subject material of the Site can be found in Section 6. You should familiarize yourself with these disclaimers and - disclosures and conduct your own thorough due diligence into the Plend Smart Contract + disclosures and conduct your own thorough due diligence into the Superlend Smart Contract Protocol before using the Site. @@ -273,37 +273,37 @@ const TOSContent = (): JSX.Element => { Mainnet Nodes selected as a validator for Etherlink Mainnet at such time. - “Plend” means, collectively, the Plend Smart Contract Protocol, Plend - Mainnet, Plend Smart Contract Systems, and Plend Altchains. + “Superlend” means, collectively, the Superlend Smart Contract Protocol, Superlend + Mainnet, Superlend Smart Contract Systems, and Superlend Altchains. - “Plend Altchains” means Plend Smart Contract Systems deployed to + “Superlend Altchains” means Superlend Smart Contract Systems deployed to Blockchain Systems other than the Etherlink Mainnet. - “Plend Mainnet” means Plend Smart Contract Systems deployed to + “Superlend Mainnet” means Superlend Smart Contract Systems deployed to Etherlink Mainnet. - “Plend Smart Contract Protocol” means the source code for + “Superlend Smart Contract Protocol” means the source code for Blockchain-based smart contracts at{' '} - - https://github.com/Plenty-network/plend-core-contracts + + https://github.com/Plenty-network/Superlend-core-contracts {' '} - intended to be deployed to Etherlink Mainnet or Plend Altchains. + intended to be deployed to Etherlink Mainnet or Superlend Altchains. - “Plend Smart Contract Systems” means all blockchain-based smart - contract bytecodes that: (i) are compiled from the Plend Smart Contract Protocol (or + “Superlend Smart Contract Systems” means all blockchain-based smart + contract bytecodes that: (i) are compiled from the Superlend Smart Contract Protocol (or any part thereof); and (ii) are deployed to production Blockchain Systems. “Site” means the web site, web pages, web applications and information and software available at or accessible through the URLs{' '} - https://www.Plendprotocol.io/,{' '} - https://app.Plendprotocol.io/,{' '} - https://docs.Plendprotocol.io/ or - any sub-URL of any such URL and any other Plend-related website or web application + https://www.Superlendprotocol.io/,{' '} + https://app.Superlendprotocol.io/,{' '} + https://docs.Superlendprotocol.io/ or + any sub-URL of any such URL and any other Superlend-related website or web application maintained by the Site Operator. @@ -368,8 +368,8 @@ const TOSContent = (): JSX.Element => { No Site Fees; Third-Party Fees Irreversible - There are no fees or charges for use of the Site. Use of the Plend Smart Contract - System and use of Plend Mainnet and Plend Altchains are subject to third-party + There are no fees or charges for use of the Site. Use of the Superlend Smart Contract + System and use of Superlend Mainnet and Superlend Altchains are subject to third-party transaction fees. The Site Operator does not receive such fees and has no ability to reverse or refund any amounts paid in error. @@ -392,28 +392,28 @@ const TOSContent = (): JSX.Element => { The Site Operator has no obligation to ensure that the Site is a complete and - accurate source of all information relating to the Plend Smart Contract System, - Plend Mainnet, Plend Altchains or any other subject matter. The Site does not + accurate source of all information relating to the Superlend Smart Contract System, + Superlend Mainnet, Superlend Altchains or any other subject matter. The Site does not necessarily display all tokens that are available for trading in connection with the - Plend Smart Contract System or Plend Mainnet or Plend Altchains. Even if the Site + Superlend Smart Contract System or Superlend Mainnet or Superlend Altchains. Even if the Site currently displays a particular token or token pair, the Site may discontinue tracking and publishing information about that token or token pair at any time, in the Site Operator's sole and absolute discretion. In the event of such a discontinuation, Users may need to rely on third-party resources such as block - explorers or Etherlink Mainnet Nodes, or applicable node for a Plend Altchains, in + explorers or Etherlink Mainnet Nodes, or applicable node for a Superlend Altchains, in order to get equivalent information, and, depending on the User's level of expertise and the quality of such third-party resources, this may result in the User incurring financial losses due to delays or mistakes in processing information or transactions. - The Plend Smart Contract Protocol is available under a free open-source license, and + The Superlend Smart Contract Protocol is available under a free open-source license, and the Site Operator does not have proprietary or exclusive rights in all copies or - derivatives thereof. It is possible that additional copies of the Plend Smart + derivatives thereof. It is possible that additional copies of the Superlend Smart Contract Protocol or derivatives thereof will be deployed to other Blockchain - Systems in the future by any person, resulting in the existence of multiple ‘Plend- + Systems in the future by any person, resulting in the existence of multiple ‘Superlend- branded' smart contract systems. The Site Operator is under no obligation to publish - information for all such copies of the Plend Smart Contract Protocol or to warn + information for all such copies of the Superlend Smart Contract Protocol or to warn Users regarding the existence of such alternatives. @@ -486,7 +486,7 @@ const TOSContent = (): JSX.Element => { The software code for the Site is available at https://github.com/plentynetwork and - is licensed for use in connection with the Plend Smart Contract System, Etherlink + is licensed for use in connection with the Superlend Smart Contract System, Etherlink Mainnet and Altchains. @@ -505,10 +505,10 @@ const TOSContent = (): JSX.Element => { - Plend Smart Contract Protocol + Superlend Smart Contract Protocol - The Plend Smart Contract Protocol will be available in various repositories at + The Superlend Smart Contract Protocol will be available in various repositories at GITHUBLINK, and will be subject to any licenses set forth in each such repository, as applicable. @@ -678,8 +678,8 @@ const TOSContent = (): JSX.Element => { User is not, (and, if User is an entity, User is not owned or controlled by any other person who is), acting, directly or indirectly, on behalf of any other person who is, located, ordinarily resident, organized, established, or domiciled in the - United States or any country where use of the Plend Smart Contract System, Plend - Mainnet, Plend Altchains or related activities is illegal, prohibited, or requires a + United States or any country where use of the Superlend Smart Contract System, Superlend + Mainnet, Superlend Altchains or related activities is illegal, prohibited, or requires a permit or license. User is not (and, if User is an entity, User is not owned or controlled by any other person who is) acting, directly or indirectly, on behalf of any other person who is: in contravention of any applicable laws and regulations, @@ -699,7 +699,7 @@ const TOSContent = (): JSX.Element => { writing that it is such a person, conduct further due diligence and determines that the User shall be permitted to use the Site; or as trustee, agent, representative or nominee for a foreign shell bank. The tokens or other funds User uses to participate - in the Plend Smart Contract System, Plend Mainnet or Plend Altchains are not derived + in the Superlend Smart Contract System, Superlend Mainnet or Superlend Altchains are not derived from, and do not otherwise represent the proceeds of, any activities done in violation or contravention of any law. @@ -710,12 +710,12 @@ const TOSContent = (): JSX.Element => { User is knowledgeable, experienced and sophisticated in using and evaluating - blockchain and related technologies and assets, including Plend Altchains, tokens, + blockchain and related technologies and assets, including Superlend Altchains, tokens, yield-generating smart contract systems, automated market making smart contract systems, bonding curve systems and “smart contracts” (runtime bytecode deployed to - Plend Altchains or another blockchain). User has conducted its own thorough - independent investigation and analysis of the Plend Smart Contract System, Plend - Mainnet, Plend Altchains and the other matters contemplated by these Terms, and has + Superlend Altchains or another blockchain). User has conducted its own thorough + independent investigation and analysis of the Superlend Smart Contract System, Superlend + Mainnet, Superlend Altchains and the other matters contemplated by these Terms, and has not relied upon any information, statement, omission, representation or warranty, express or implied, written or oral, made byor on behalf of Site Operator in connection therewith, except as expressly set forth by Site Operator in these Terms. @@ -770,11 +770,11 @@ const TOSContent = (): JSX.Element => { No Responsibility for Tokens; No Guarantee of Uniqueness or IP - Site Operator has no responsibility for the tokens traded by Users on the Plend - Smart Contract System or Plend Mainnet or Plend Altchains. Site Operator does not + Site Operator has no responsibility for the tokens traded by Users on the Superlend + Smart Contract System or Superlend Mainnet or Superlend Altchains. Site Operator does not investigate and cannot guarantee or warrant the authenticity, originality, uniqueness, marketability, legality or value of any token traded by Users on the - Plend Smart Contract System or Plend Mainnet or Plend Altchains, even if information + Superlend Smart Contract System or Superlend Mainnet or Superlend Altchains, even if information about such token is available on the Site. @@ -848,13 +848,13 @@ const TOSContent = (): JSX.Element => { Certain Risks of Blockchain Technology. The technologies relevant to the Site depend on public peer-to-peer networks such as Etherlink - Mainnet and the Plend Altchains that are not under the control or influence of + Mainnet and the Superlend Altchains that are not under the control or influence of Site Operator and are subject to many risks and uncertainties. Such technologies - include the Plend Smart Contract System, which Site Operator has no ability to + include the Superlend Smart Contract System, which Site Operator has no ability to change, other than ceasing to display information about certain “smart contracts” or adding information about new “smart contracts”. Users are solely responsible for the safekeeping of the private key associated with the blockchain address used - in connection with the Plend Smart Contract System. Site Operator will not be able + in connection with the Superlend Smart Contract System. Site Operator will not be able to restore or issue any refund in respect of property lost or frozen due to loss of private keys or otherwise. If a User is not able to spend or use tokens due to loss or theft of the corresponding private key or otherwise, a User will be unable @@ -862,14 +862,14 @@ const TOSContent = (): JSX.Element => { Certain Risks of Smart Contract Technology. Digital - assets relevant to the Site depend on the Plend Smart Contract System or other - smart contracts deployed to Plend Altchains or other blockchain systems, or on the + assets relevant to the Site depend on the Superlend Smart Contract System or other + smart contracts deployed to Superlend Altchains or other blockchain systems, or on the Etherlink Mainnet, each of which may be coded or deployed by persons other than - Site Operator. Etherlink Mainnet, Plend Altchains, and other Blockchain Systems, + Site Operator. Etherlink Mainnet, Superlend Altchains, and other Blockchain Systems, and, once deployed to a Blockchain System, the code of smart contracts, including - the Plend Smart Contract System, typically cannot be modified, or can only be - modified in limited ways. In the event that the Etherlink Mainnet, Plend - Altchains, Plend Smart Contract System or other smart contracts or blockchain + the Superlend Smart Contract System, typically cannot be modified, or can only be + modified in limited ways. In the event that the Etherlink Mainnet, Superlend + Altchains, Superlend Smart Contract System or other smart contracts or blockchain systems are adversely affected by malfunctions, bugs, defects, malfunctions, hacking, theft, attacks, negligent coding or design choices, or changes to the applicable protocol rules, Users may be exposed to a risk of total loss and @@ -885,17 +885,17 @@ const TOSContent = (): JSX.Element => { is generated by speculators and investors seeking to profit from the short- or long-term holding of blockchain assets. The market value of any token may decline below the price for which a User acquires such asset through the Etherlink - Mainnet, Plend Altchains or Plend Smart Contract System or on any other system. + Mainnet, Superlend Altchains or Superlend Smart Contract System or on any other system. User acknowledges and agrees that the costs and speeds of transacting with - cryptographic and blockchain-based systems such as the Etherlink Mainnet, Plend - Altchains and Plend Smart Contract System are variable and may increase or + cryptographic and blockchain-based systems such as the Etherlink Mainnet, Superlend + Altchains and Superlend Smart Contract System are variable and may increase or decrease dramatically at any time, resulting in prolonged inability to access or use any tokens. Regulatory Uncertainty. Blockchain technologies and digital assets are subject to many legal and regulatory uncertainties, and the - Etherlink Mainnet, Plend Altchains, Plend Smart Contract System or any tokens + Etherlink Mainnet, Superlend Altchains, Superlend Smart Contract System or any tokens could be adversely impacted by one or more regulatory or legal inquiries, actions, suits, investigations, claims, fines or judgments, which could impede or limit the ability of User to continue the use and enjoyment of such assets and technologies. @@ -903,13 +903,13 @@ const TOSContent = (): JSX.Element => { Cryptography Risks. Cryptography is a progressing field. Advances in code cracking or technical advances such as the development of quantum - computers may present risks to Blockchain Systems, the Etherlink Mainnet, Plend - Altchains, Plend Smart Contract System or tokens, including the theft, loss or + computers may present risks to Blockchain Systems, the Etherlink Mainnet, Superlend + Altchains, Superlend Smart Contract System or tokens, including the theft, loss or inaccessibility thereof. - Fork Handling. Etherlink Mainnet, Plend Altchains, the - Plend Smart Contract System, and all tokens may be subject to “forks.” Forks occur + Fork Handling. Etherlink Mainnet, Superlend Altchains, the + Superlend Smart Contract System, and all tokens may be subject to “forks.” Forks occur when some or all persons running the software clients for a particular blockchain system adopt a new client or a new version of an existing client that: (i) changes the protocol rules in backwards-compatible or backwards-incompatible manner that @@ -929,10 +929,10 @@ const TOSContent = (): JSX.Element => { obligation or liability to a User if such response (or lack of such response) acts to a User detriment. Without limiting the generality of the foregoing, Site Operator's possible and permissible responses to a fork may include: (i) honoring - the Etherlink Mainnet, Plend Altchains, Plend Smart Contract System and tokens on - both chains;(ii) honoring the Etherlink Mainnet, Plend Altchains, Plend Smart + the Etherlink Mainnet, Superlend Altchains, Superlend Smart Contract System and tokens on + both chains;(ii) honoring the Etherlink Mainnet, Superlend Altchains, Superlend Smart Contract System and tokens on only one of the chains; (iii) honoring the Etherlink - Mainnet, Plend Altchains, Plend Smart Contract System and tokens in different + Mainnet, Superlend Altchains, Superlend Smart Contract System and tokens in different respects or to a different extent on both chains; or (iv) any other response or policy or procedure, as determined by Site Operator in its sole and absolute discretion. Each User assumes full responsibility to independently remain apprised @@ -941,17 +941,17 @@ const TOSContent = (): JSX.Element => { Essential Third-Party Software Dependencies. The - Etherlink Mainnet, Plend Altchains, Plend Smart Contract System and other relevant + Etherlink Mainnet, Superlend Altchains, Superlend Smart Contract System and other relevant Blockchain Systems and smart contracts are public software utilities which are accessible directly through any compatible node or indirectly through any compatible “wallet” application (such as the web browser plugin MetaMask) which - interacts with such a node. Interacting with the Plend Smart Contract System does + interacts with such a node. Interacting with the Superlend Smart Contract System does not require use of the Site, but the Site provides a convenient and user- friendly - method of reading and displaying data from the Plend Smart Contract System and - generating standard transaction messages compatible with the Plend Smart Contract - System. Because the Site does not provide wallet software or nodes for Plend - Mainnet or Plend Altchains, such software constitutes an essential third-party or - user dependency without which the Plend Smart Contract System cannot be utilized, + method of reading and displaying data from the Superlend Smart Contract System and + generating standard transaction messages compatible with the Superlend Smart Contract + System. Because the Site does not provide wallet software or nodes for Superlend + Mainnet or Superlend Altchains, such software constitutes an essential third-party or + user dependency without which the Superlend Smart Contract System cannot be utilized, and tokens cannot be traded or used. Furthermore, the site may utilize APIs, middleware and servers of Site Operator or third parties, and Site Operator does not guarantee the continued operation, maintenance, availability or security of @@ -1206,8 +1206,8 @@ const TOSContent = (): JSX.Element => { (including any provision of any present or future law or regulation or any act of any governmental authority, any act of God or war or terrorism, any epidemic or pandemic, or the unavailability, disruption or malfunction of the Internet, the - World Wide Web or any other electronic network, the Etherlink Mainnet or Plend - Altchains or Plend Smart Contract System or any aspect thereof, or any consensus + World Wide Web or any other electronic network, the Etherlink Mainnet or Superlend + Altchains or Superlend Smart Contract System or any aspect thereof, or any consensus attack, or hack, or denial-of-service or other attack on the foregoing or any aspect thereof, or on the other software, networks and infrastructure that enables Site Operator to provide the Site), it being understood that Site Operator shall use diff --git a/src/utils/theme.tsx b/src/utils/theme.tsx index 0bd7bc04..56741c92 100644 --- a/src/utils/theme.tsx +++ b/src/utils/theme.tsx @@ -189,7 +189,7 @@ export const getDesignTokens = (mode: 'light' | 'dark') => { navbar: getColor('#FF5B00', '#FF5B00'), header: getColor('#d9d9d9', '#151519'), paper: getColor('#f1f1f1', '#302D2A'), - surface: getColor('#F7F7F9', '#3F2566'), + surface: getColor('#F7F7F9', '#2A2826'), disabled: getColor('#EAEBEF', '#EBEBEF14'), }, divider: getColor('#EAEBEF', '#EBEBEF14'), @@ -454,14 +454,14 @@ export function getThemedComponents(theme: Theme) { style: { color: theme.palette.mode === 'light' ? theme.palette.common.white : theme.palette.common.black, - background: theme.palette.gradients.aaveGradient, - // background: theme.palette.mode === 'light' ? - // '#0F244B' : '#D4FFDF', + // background: theme.palette.gradients.aaveGradient, + background: theme.palette.mode === 'light' ? + '#0F244B' : '#F1FF52', transition: 'all 0.2s ease', '&:hover, &.Mui-focusVisible': { - background: theme.palette.gradients.aaveGradient, - // background: theme.palette.mode === 'light' ? - // '#0F244B' : '#D4FFDF', + // background: theme.palette.gradients.aaveGradient, + background: theme.palette.mode === 'light' ? + '#0F244B' : '#F1FF52', opacity: '0.9', }, }, @@ -471,10 +471,10 @@ export function getThemedComponents(theme: Theme) { style: { background: "transparent", borderColor: theme.palette.mode === 'light' - ? "#2A2826" : "#D4FFDF", + ? "#2A2826" : "#F1FF52", '&:hover, &.Mui-focusVisible': { background: theme.palette.mode === 'light' - ? "#0F244B" : "#D4FFDF", + ? "#0F244B" : "#F1FF52", color: theme.palette.mode === 'light' ? '#f1f1f1' : '#2A2826' }, @@ -584,7 +584,8 @@ export function getThemedComponents(theme: Theme) { { props: { variant: 'outlined' }, style: { - border: `1px solid ${theme.palette.divider}`, + border: `1px solid ${theme.palette.mode === 'dark' ? + theme.palette.divider : "#cecece"}`, boxShadow: '0px 0px 2px rgba(0, 0, 0, 0.2), 0px 2px 10px rgba(0, 0, 0, 0.1)', background: theme.palette.mode === 'light' From 1af92bb444a16ad3b01d891a69ae44effb64f9d6 Mon Sep 17 00:00:00 2001 From: shreyaspangal Date: Tue, 13 Aug 2024 16:11:37 +0530 Subject: [PATCH 17/28] fix: pToken to slToken update --- src/modules/reserve-overview/TokenLinkDropdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/reserve-overview/TokenLinkDropdown.tsx b/src/modules/reserve-overview/TokenLinkDropdown.tsx index 755f80cd..ac90dd5b 100644 --- a/src/modules/reserve-overview/TokenLinkDropdown.tsx +++ b/src/modules/reserve-overview/TokenLinkDropdown.tsx @@ -82,7 +82,7 @@ export const TokenLinkDropdown = ({ poolReserve, downToSM }: TokenLinkDropdownPr > - {'p' + poolReserve.symbol} + {'sl' + poolReserve.symbol} {poolReserve.borrowingEnabled && ( From 0e075687b3259d9b443479cdd4c5788b1da7025d Mon Sep 17 00:00:00 2001 From: shreyaspangal Date: Tue, 13 Aug 2024 16:46:04 +0530 Subject: [PATCH 18/28] ui: add font family --- pages/_app.page.tsx | 3 ++- .../basier-circle/BasierCircle-Regular.woff | Bin 0 -> 22496 bytes .../basier-circle/BasierSquare-Regular.woff | Bin 0 -> 22380 bytes public/fonts/basier-circle/basier-circle.css | 16 ++++++++++++++++ public/fonts/basier-circle/example.html | 17 +++++++++++++++++ src/utils/theme.tsx | 2 +- 6 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 public/fonts/basier-circle/BasierCircle-Regular.woff create mode 100644 public/fonts/basier-circle/BasierSquare-Regular.woff create mode 100644 public/fonts/basier-circle/basier-circle.css create mode 100644 public/fonts/basier-circle/example.html diff --git a/pages/_app.page.tsx b/pages/_app.page.tsx index 64b8510c..d21e58a0 100644 --- a/pages/_app.page.tsx +++ b/pages/_app.page.tsx @@ -1,5 +1,6 @@ +import '/public/fonts/basier-circle/basier-circle.css'; import '/public/fonts/inter/inter.css'; -import '/public/fonts/space-grotesk/space-grotesk.css'; +// import '/public/fonts/space-grotesk/space-grotesk.css'; import '/src/styles/variables.css'; import { CacheProvider, EmotionCache } from '@emotion/react'; diff --git a/public/fonts/basier-circle/BasierCircle-Regular.woff b/public/fonts/basier-circle/BasierCircle-Regular.woff new file mode 100644 index 0000000000000000000000000000000000000000..a8735baf246da6cf38a4313bb2c02eeb60db8940 GIT binary patch literal 22496 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

FKbnzJw~hM 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 literal 0 HcmV?d00001 diff --git a/public/fonts/basier-circle/BasierSquare-Regular.woff b/public/fonts/basier-circle/BasierSquare-Regular.woff new file mode 100644 index 0000000000000000000000000000000000000000..bfce839dbad028eadb6ebbdb4a7eeaaf6ed37f05 GIT binary patch literal 22380 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Π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 + + + + + + + + +

Generated from: http://font.download


+

AaBbCcDdEeFfGgHhŞşIıİi Example

+

AaBbCcDdEeFfGgHhŞşIıİi Example

+ + + + \ No newline at end of file diff --git a/src/utils/theme.tsx b/src/utils/theme.tsx index 56741c92..f6c3bc1c 100644 --- a/src/utils/theme.tsx +++ b/src/utils/theme.tsx @@ -18,7 +18,7 @@ const { } = theme; const FONT = 'Inter, Arial'; -const FONT_HEADER = 'Space Grotesk, monospace'; +const FONT_HEADER = '"Basier Circle Regular"'; declare module '@mui/material/styles/createPalette' { interface PaletteColor extends ColorPartial { } From 29ef8226c34e7fe52a6e62afab8b4f19c2cd5efc Mon Sep 17 00:00:00 2001 From: shreyaspangal Date: Wed, 14 Aug 2024 12:43:35 +0530 Subject: [PATCH 19/28] ui: launguage list dark mode bg --- src/layouts/SettingsMenu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/SettingsMenu.tsx b/src/layouts/SettingsMenu.tsx index e400e2de..3fe64113 100644 --- a/src/layouts/SettingsMenu.tsx +++ b/src/layouts/SettingsMenu.tsx @@ -84,7 +84,7 @@ export function SettingsMenu() { open={languagesOpen} onClose={handleClose} keepMounted={true} - sx={{ '.MuiList-root.MuiMenu-list': { background: palette.mode === 'dark' ? "#0F244B" : "#f1f1f1" } }} + sx={{ '.MuiList-root.MuiMenu-list': { background: palette.mode === 'dark' ? "#2A2826" : "#f1f1f1" } }} > From 3b54f549d61f1bc7f27e82b0bbbc2e024287e565 Mon Sep 17 00:00:00 2001 From: shreyaspangal Date: Thu, 22 Aug 2024 19:37:27 +0530 Subject: [PATCH 20/28] update: secondary cta button and body text font family --- src/components/ConnectWalletPaper.tsx | 4 ++-- src/components/WalletConnection/ConnectWalletButton.tsx | 2 +- src/components/WalletConnection/WalletSelector.tsx | 2 +- src/modules/dashboard/DashboardEModeButton.tsx | 2 +- src/modules/reserve-overview/ReserveTopDetails.tsx | 2 +- src/utils/theme.tsx | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/ConnectWalletPaper.tsx b/src/components/ConnectWalletPaper.tsx index 046e98f3..014827f3 100644 --- a/src/components/ConnectWalletPaper.tsx +++ b/src/components/ConnectWalletPaper.tsx @@ -127,8 +127,8 @@ export const InnerLink = ({ children, href }: InnerLinkProps) => { ({ - color: theme.palette.mode === 'light' ? '#0F244B' : '#F1FF52', + sx={() => ({ + color: '#FF5B00', textDecoration: 'underline', })} > diff --git a/src/components/WalletConnection/ConnectWalletButton.tsx b/src/components/WalletConnection/ConnectWalletButton.tsx index 9a5de673..428a1058 100644 --- a/src/components/WalletConnection/ConnectWalletButton.tsx +++ b/src/components/WalletConnection/ConnectWalletButton.tsx @@ -9,7 +9,7 @@ export const ConnectWalletButton = () => { return ( <> - diff --git a/src/components/WalletConnection/WalletSelector.tsx b/src/components/WalletConnection/WalletSelector.tsx index 72e1c4d3..c3e36194 100644 --- a/src/components/WalletConnection/WalletSelector.tsx +++ b/src/components/WalletConnection/WalletSelector.tsx @@ -193,7 +193,7 @@ export const WalletSelector = () => { sx={(theme) => ({ py: 1, px: 3, - border: `1px solid ${theme.palette.divider}`, + border: `1px solid ${theme.palette.mode === "dark" ? theme.palette.divider : theme.palette.text.secondary}`, borderRadius: '6px', mb: 1, overflow: 'show', diff --git a/src/modules/dashboard/DashboardEModeButton.tsx b/src/modules/dashboard/DashboardEModeButton.tsx index 33c4c73e..cca8e61c 100644 --- a/src/modules/dashboard/DashboardEModeButton.tsx +++ b/src/modules/dashboard/DashboardEModeButton.tsx @@ -205,7 +205,7 @@ export const DashboardEModeButton = ({ userEmodeCategoryId }: DashboardEModeButt {isEModeDisabled ? (