From 10cf640f11b19bc0a29e8d02678b4fb6c6f3bee4 Mon Sep 17 00:00:00 2001 From: tjs Date: Thu, 17 Aug 2023 19:47:11 -0400 Subject: [PATCH] update prettier pkgs, config, and reformat --- .prettierrc | 5 --- components/Layout.tsx | 4 +-- components/RpcPing.tsx | 2 +- components/SideNav.tsx | 2 +- components/SolanaTps.tsx | 2 +- components/StatusBar.tsx | 20 ++++++------ components/TokenList.tsx | 6 ++-- components/TopBar.tsx | 6 ++-- components/Tps.tsx | 4 +-- components/account/AccountChart.tsx | 2 +- components/account/AccountHeroStats.tsx | 10 +++--- components/account/AccountPage.tsx | 4 +-- components/account/AccountValue.tsx | 2 +- components/account/ActivityFilters.tsx | 2 +- components/account/MarketsHealthTable.tsx | 2 +- components/account/TokensHealthTable.tsx | 2 +- components/borrow/AssetsBorrowsTable.tsx | 2 +- components/borrow/BorrowPage.tsx | 6 ++-- components/borrow/YourBorrowsTable.tsx | 2 +- .../governance/ListMarket/ListMarket.tsx | 4 +-- components/governance/ListToken/ListToken.tsx | 2 +- components/governance/Vote/ProposalCard.tsx | 2 +- components/governance/Vote/Vote.tsx | 2 +- components/governance/Vote/VotePage.tsx | 2 +- .../modals/CreateOpenbookMarketModal.tsx | 5 ++- .../modals/DashboardSuggestedValuesModal.tsx | 2 +- components/modals/MangoAccountSizeModal.tsx | 6 ++-- components/modals/SharePositionModal.tsx | 2 +- components/modals/UserSetupModal.tsx | 8 ++--- components/nftMarket/NftMarketButton.tsx | 2 +- .../notifications/NotificationsButton.tsx | 2 +- components/profile/EditProfileForm.tsx | 2 +- components/rewards/PromoBanner.tsx | 2 +- components/rewards/RewardsPage.tsx | 2 +- components/settings/AccountSettings.tsx | 28 ++++++++-------- components/settings/HotKeysSettings.tsx | 2 +- components/shared/BalancesTable.tsx | 2 +- components/shared/DirectionTriangles.tsx | 4 +-- components/shared/PnlTooltipContent.tsx | 4 +-- components/shared/SecondaryTabBar.tsx | 2 +- components/shared/SoonBadge.tsx | 2 +- components/shared/TabUnderline.tsx | 2 +- components/shared/TokenListButton.tsx | 2 +- .../stats/perps/MangoPerpStatsCharts.tsx | 6 ++-- .../stats/perps/PerpMarketDetailsTable.tsx | 2 +- .../stats/perps/PerpMarketsOverviewTable.tsx | 2 +- .../stats/perps/PerpMarketsPositions.tsx | 4 +-- .../stats/perps/PerpPositionsStatsTable.tsx | 2 +- components/stats/spot/SpotMarketsTable.tsx | 2 +- components/stats/tokens/TokenDetailsTable.tsx | 2 +- .../stats/tokens/TokenOverviewTable.tsx | 2 +- components/stats/tokens/TokenStatsCharts.tsx | 6 ++-- components/swap/BuyTokenInput.tsx | 2 +- components/swap/FavoriteSwapsBar.tsx | 2 +- components/swap/LimitSwapForm.tsx | 8 ++--- components/swap/MarketSwapForm.tsx | 8 ++--- components/swap/SellTokenInput.tsx | 2 +- components/swap/SlippageSettings.tsx | 2 +- components/swap/SwapForm.tsx | 2 +- components/swap/SwapFormTokenList.tsx | 2 +- components/swap/SwapHistoryTable.tsx | 2 +- components/swap/SwapOrders.tsx | 24 +++++++------- components/swap/SwapReviewRouteInfo.tsx | 2 +- components/swap/SwapSettings.tsx | 2 +- components/swap/SwapTokenChart.tsx | 4 +-- components/swap/TokenSelect.tsx | 2 +- components/token/ChartTabs.tsx | 6 ++-- components/token/CoingeckoStats.tsx | 2 +- components/token/TokenPage.tsx | 2 +- components/token/TopTokenAccounts.tsx | 4 +-- components/trade/AdvancedMarketHeader.tsx | 2 +- components/trade/AdvancedTradeForm.tsx | 2 +- components/trade/DepthChart.tsx | 2 +- components/trade/FavoriteMarketsBar.tsx | 2 +- components/trade/MarketSelectDropdown.tsx | 32 +++++++++---------- components/trade/MaxMarketSwapAmount.tsx | 2 +- components/trade/Orderbook.tsx | 4 +-- components/trade/OrderbookTooltip.tsx | 2 +- components/trade/PerpPositions.tsx | 18 +++++------ components/trade/RecentTrades.tsx | 2 +- components/trade/SpotMarketOrderSwapForm.tsx | 4 +-- components/trade/TradeAdvancedPage.tsx | 4 +-- components/trade/TradingViewChart.tsx | 2 +- components/trade/TradingViewChartKline.tsx | 2 +- components/wallet/ConnectWalletButton.tsx | 2 +- package.json | 4 +-- pages/dashboard/index.tsx | 10 +++--- pages/nft/index.tsx | 2 +- prettier.config.js | 6 ++++ utils/governance/accounts/vsrAccounts.ts | 5 ++- .../governance/market/createOpenBookMarket.ts | 5 ++- yarn.lock | 16 +++++----- 92 files changed, 206 insertions(+), 208 deletions(-) delete mode 100644 .prettierrc create mode 100644 prettier.config.js diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index e3b414c7..00000000 --- a/.prettierrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "semi": false, - "singleQuote": true, - "trailingComma": "all" -} diff --git a/components/Layout.tsx b/components/Layout.tsx index 490d6874..a3cb23d4 100644 --- a/components/Layout.tsx +++ b/components/Layout.tsx @@ -114,7 +114,7 @@ const Layout = ({ children }: { children: ReactNode }) => { onClick={handleToggleSidebar} > @@ -197,7 +197,7 @@ function DeployRefreshManager(): JSX.Element | null { leaveTo="opacity-0" > ) : ( diff --git a/components/governance/Vote/ProposalCard.tsx b/components/governance/Vote/ProposalCard.tsx index ae91e52a..8dc4d023 100644 --- a/components/governance/Vote/ProposalCard.tsx +++ b/components/governance/Vote/ProposalCard.tsx @@ -266,7 +266,7 @@ const ProposalCard = ({ )} {mangoMint && ( -
+
{ return (
-

{t('active-proposals')}

+

{t('active-proposals')}

{loadingProposals || loadingRealm ? ( diff --git a/components/governance/Vote/VotePage.tsx b/components/governance/Vote/VotePage.tsx index e802fde6..d5690b9c 100644 --- a/components/governance/Vote/VotePage.tsx +++ b/components/governance/Vote/VotePage.tsx @@ -5,7 +5,7 @@ const Vote = dynamic(() => import('./Vote')) const VotePage = () => { return ( -
+
diff --git a/components/modals/CreateOpenbookMarketModal.tsx b/components/modals/CreateOpenbookMarketModal.tsx index 1e1de515..69ceab2e 100644 --- a/components/modals/CreateOpenbookMarketModal.tsx +++ b/components/modals/CreateOpenbookMarketModal.tsx @@ -156,9 +156,8 @@ const CreateOpenbookMarketModal = ({ useEffect(() => { const getMinLamportsToCreateMarket = async () => { const accountsSpace = 84522 + MARKET_STATE_LAYOUT_V2.span - const minLamports = await connection.getMinimumBalanceForRentExemption( - accountsSpace, - ) + const minLamports = + await connection.getMinimumBalanceForRentExemption(accountsSpace) setSolNeededToCreateMarket( Math.round((minLamports / LAMPORTS_PER_SOL + Number.EPSILON) * 100) / 100, diff --git a/components/modals/DashboardSuggestedValuesModal.tsx b/components/modals/DashboardSuggestedValuesModal.tsx index 6f4bb43f..df61ef23 100644 --- a/components/modals/DashboardSuggestedValuesModal.tsx +++ b/components/modals/DashboardSuggestedValuesModal.tsx @@ -287,7 +287,7 @@ const DashboardSuggestedValues = ({

{bank.name} - Suggested tier: {suggestedTier}

-
+
{ />
-
+
= 0 ? '/images/space.svg' : '/images/underwater.svg'} alt="Share Background" diff --git a/components/modals/UserSetupModal.tsx b/components/modals/UserSetupModal.tsx index e5aee7c9..9691ec8e 100644 --- a/components/modals/UserSetupModal.tsx +++ b/components/modals/UserSetupModal.tsx @@ -228,7 +228,7 @@ const UserSetupModal = ({ next -
+
{walletsDisplayed?.map((w) => ( ) : ( )} diff --git a/components/swap/SellTokenInput.tsx b/components/swap/SellTokenInput.tsx index 6aa5cc67..11d093dd 100644 --- a/components/swap/SellTokenInput.tsx +++ b/components/swap/SellTokenInput.tsx @@ -87,7 +87,7 @@ const SellTokenInput = ({ isAllowed={withValueLimit} /> {!isNaN(Number(amountInFormValue)) ? ( - + {inputBank ? formatCurrencyValue( inputBank.uiPrice * Number(amountInFormValue), diff --git a/components/swap/SlippageSettings.tsx b/components/swap/SlippageSettings.tsx index 02b9a7d0..eabe4842 100644 --- a/components/swap/SlippageSettings.tsx +++ b/components/swap/SlippageSettings.tsx @@ -32,7 +32,7 @@ const SlippageSettings = ({ onClose }: { onClose: () => void }) => { <>

{t('swap:slippage')}

diff --git a/components/swap/SwapForm.tsx b/components/swap/SwapForm.tsx index 0c4c1131..ec25b9ac 100644 --- a/components/swap/SwapForm.tsx +++ b/components/swap/SwapForm.tsx @@ -132,7 +132,7 @@ const SwapForm = () => { return (
diff --git a/components/swap/SwapHistoryTable.tsx b/components/swap/SwapHistoryTable.tsx index 1bbb0ba8..48e3a3fc 100644 --- a/components/swap/SwapHistoryTable.tsx +++ b/components/swap/SwapHistoryTable.tsx @@ -391,7 +391,7 @@ const SwapHistoryTable = () => { enterTo="opacity-100" > -
+

{t('value')} diff --git a/components/swap/SwapOrders.tsx b/components/swap/SwapOrders.tsx index 07748173..23524116 100644 --- a/components/swap/SwapOrders.tsx +++ b/components/swap/SwapOrders.tsx @@ -290,7 +290,7 @@ const SwapOrders = () => {

{size} - + {' '} {bank.name} @@ -299,7 +299,7 @@ const SwapOrders = () => {

{filled}/{size} - + {' '} {bank.name} @@ -308,7 +308,7 @@ const SwapOrders = () => {

{currentPrice} - + {' '} {buyBank.name} @@ -317,7 +317,7 @@ const SwapOrders = () => {

{triggerPrice} - + {' '} {side === 'buy' ? sellBank.name : buyBank.name} @@ -377,15 +377,15 @@ const SwapOrders = () => {

{size} - + {' '} {bank.name} - + {' at '} {triggerPrice} - + {' '} {side === 'buy' ? sellBank.name : buyBank.name} @@ -404,14 +404,14 @@ const SwapOrders = () => { enterTo="opacity-100" > -

+

{t('trade:size')}

{size} - + {' '} {bank.name} @@ -423,7 +423,7 @@ const SwapOrders = () => {

{filled}/{size} - + {' '} {bank.name} @@ -435,7 +435,7 @@ const SwapOrders = () => {

{currentPrice} - + {' '} {buyBank.name} @@ -447,7 +447,7 @@ const SwapOrders = () => {

{triggerPrice} - + {' '} {side === 'buy' ? sellBank.name : buyBank.name} diff --git a/components/swap/SwapReviewRouteInfo.tsx b/components/swap/SwapReviewRouteInfo.tsx index c2e37888..a7808643 100644 --- a/components/swap/SwapReviewRouteInfo.tsx +++ b/components/swap/SwapReviewRouteInfo.tsx @@ -374,7 +374,7 @@ const SwapReviewRouteInfo = ({

void }) => { <>

{t('settings')}

{ ) : chartData?.length && baseTokenId && quoteTokenId ? (
{swapTooltipData ? ( -
+
{renderTooltipContent(swapTooltipData)}
) : null} @@ -543,7 +543,7 @@ const SwapTokenChart = () => {
-
+
{ return (
*/}
-
+

{t('market')}

{t('price')}

{t('rolling-change')}

-

+

{t('daily-volume')}

@@ -348,7 +348,7 @@ const MarketSelectDropdown = () => { const volume = volumeData ? volumeData : 0 return ( -
+
{ >
- + {m.name}
@@ -389,7 +389,7 @@ const MarketSelectDropdown = () => {
-
+
{loadingMarketData ? (
diff --git a/components/trade/MaxMarketSwapAmount.tsx b/components/trade/MaxMarketSwapAmount.tsx index 1e7f7527..80f2575d 100644 --- a/components/trade/MaxMarketSwapAmount.tsx +++ b/components/trade/MaxMarketSwapAmount.tsx @@ -45,7 +45,7 @@ const MaxMarketSwapAmount = ({ if (mangoAccountLoading) return null return ( -
+

{t('trade:size')}

{ return (
-
+
{market ? ( <>

{t('trade:grouping')}:

@@ -521,7 +521,7 @@ const Orderbook = () => { ) })}
diff --git a/components/trade/OrderbookTooltip.tsx b/components/trade/OrderbookTooltip.tsx index 8a45655e..d8d6eff6 100644 --- a/components/trade/OrderbookTooltip.tsx +++ b/components/trade/OrderbookTooltip.tsx @@ -27,7 +27,7 @@ const OrderbookTooltip = () => { const isPerp = serumOrPerpMarket instanceof PerpMarket return (
diff --git a/components/trade/PerpPositions.tsx b/components/trade/PerpPositions.tsx index 8e1bd68f..8b418e54 100644 --- a/components/trade/PerpPositions.tsx +++ b/components/trade/PerpPositions.tsx @@ -320,7 +320,7 @@ const PerpPositions = () => { {openPerpPositions.length > 1 ? ( <> @@ -335,8 +335,8 @@ const PerpPositions = () => { <> -
- +
+ Total: { enterTo="opacity-100" > -
+

{t('trade:size')} @@ -649,13 +649,13 @@ const PerpPositions = () => { -

+
- + Total Unrealized PnL: 0 ? 'text-th-up' : 'text-th-down' @@ -676,11 +676,11 @@ const PerpPositions = () => { enterTo="opacity-100" > - + Total ROE: = 0 ? 'text-th-up' : 'text-th-down' diff --git a/components/trade/RecentTrades.tsx b/components/trade/RecentTrades.tsx index 53117976..507bbf2f 100644 --- a/components/trade/RecentTrades.tsx +++ b/components/trade/RecentTrades.tsx @@ -162,7 +162,7 @@ const RecentTrades = () => { return (
-
+
-
+
{ipAllowed ? (
-

Banks

+

Banks

{Array.from(group.banksMapByMint) .sort((a, b) => a[0].localeCompare(b[0])) @@ -315,7 +315,7 @@ const Dashboard: NextPage = () => { value={`${formattedBankValues.liquidationFee}%`} /> {bank.mint.toBase58() !== USDC_MINT && ( -
+
-

+

Perp Markets

@@ -635,7 +635,7 @@ const Dashboard: NextPage = () => { ) })}
-

+

Spot Markets

@@ -815,7 +815,7 @@ export const DashboardNavbar = () => { const { asPath } = useRouter() return ( -
+

{ return isWhiteListed ? ( <>
-
+

NFT Market