fix trustless registers + prettier fix (#215)

.prettierrc

@@ -1,4 +1,5 @@
 {
   "semi": false,
-  "singleQuote": true
+  "singleQuote": true,
+  "trailingComma": "all"
 }

apis/datafeed.ts

@@ -102,7 +102,7 @@ let marketType: 'spot' | 'perp'
 
 export const queryPerpBars = async (
   tokenAddress: string,
-  resolution: (typeof SUPPORTED_RESOLUTIONS)[number],
+  resolution: typeof SUPPORTED_RESOLUTIONS[number],
   periodParams: {
     firstDataRequest: boolean
     from: number
@@ -150,7 +150,7 @@ export const queryPerpBars = async (
 
 export const queryBirdeyeBars = async (
   tokenAddress: string,
-  resolution: (typeof SUPPORTED_RESOLUTIONS)[number],
+  resolution: typeof SUPPORTED_RESOLUTIONS[number],
   periodParams: {
     firstDataRequest: boolean
     from: number

apis/mngo/datafeed.ts

@@ -66,7 +66,7 @@ const configurationData = {
 
 export const queryBars = async (
   tokenAddress: string,
-  resolution: (typeof SUPPORTED_RESOLUTIONS)[number],
+  resolution: typeof SUPPORTED_RESOLUTIONS[number],
   periodParams: {
     firstDataRequest: boolean
     from: number

components/Layout.tsx

@@ -52,12 +52,9 @@ const Layout = ({ children }: { children: ReactNode }) => {
     const animationFrames = 15
 
     for (let x = 1; x <= animationFrames; x++) {
-      setTimeout(
+      setTimeout(() => {
-        () => {
+        window.dispatchEvent(new Event('resize'))
-          window.dispatchEvent(new Event('resize'))
+      }, (sideBarAnimationDuration / animationFrames) * x)
-        },
-        (sideBarAnimationDuration / animationFrames) * x,
-      )
     }
   }, [isCollapsed])
 

components/MangoProvider.tsx

@@ -38,23 +38,17 @@ const HydrateStore = () => {
     actions.fetchGroup()
   }, [marketName])
 
-  useInterval(
+  useInterval(() => {
-    () => {
+    actions.fetchGroup()
-      actions.fetchGroup()
+  }, (slowNetwork ? 40 : 20) * SECONDS)
-    },
-    (slowNetwork ? 40 : 20) * SECONDS,
-  )
 
   // refetches open orders every 30 seconds
   // only the selected market's open orders are updated via websocket
-  useInterval(
+  useInterval(() => {
-    () => {
+    if (mangoAccountAddress) {
-      if (mangoAccountAddress) {
+      actions.fetchOpenOrders()
-        actions.fetchOpenOrders()
+    }
-      }
+  }, (slowNetwork ? 60 : 30) * SECONDS)
-    },
-    (slowNetwork ? 60 : 30) * SECONDS,
-  )
 
   // refetch trade history and activity feed when switching accounts
   useEffect(() => {
@@ -65,13 +59,10 @@ const HydrateStore = () => {
   }, [mangoAccountAddress])
 
   // reload and parse market fills from the event queue
-  useInterval(
+  useInterval(async () => {
-    async () => {
+    const actions = mangoStore.getState().actions
-      const actions = mangoStore.getState().actions
+    actions.loadMarketFills()
-      actions.loadMarketFills()
+  }, (slowNetwork ? 60 : 20) * SECONDS)
-    },
-    (slowNetwork ? 60 : 20) * SECONDS,
-  )
 
   // The websocket library solana/web3.js uses closes its websocket connection when the subscription list
   // is empty after opening its first time, preventing subsequent subscriptions from receiving responses.

components/governance/ListToken/ListToken.tsx

@@ -492,7 +492,7 @@ const ListToken = ({ goBack }: { goBack: () => void }) => {
         .instruction()
       proposalTx.push(editIx)
     } else {
-      await client!.program.methods
+      const trustlessIx = await client!.program.methods
         .tokenRegisterTrustless(Number(advForm.tokenIndex), advForm.name)
         .accounts({
           mint: new PublicKey(advForm.mintPk),
@@ -503,6 +503,8 @@ const ListToken = ({ goBack }: { goBack: () => void }) => {
           group: group!.publicKey,
         })
         .instruction()
+
+      proposalTx.push(trustlessIx)
     }
 
     const registerMarketix = await client!.program.methods

hooks/useSelectedMarket.ts

@@ -63,8 +63,8 @@ export default function useSelectedMarket() {
         mangoTokens.find(
           (t) => t.symbol.toLowerCase() === lowerCaseBaseSymbol,
         ) ||
-        mangoTokens.find(
+        mangoTokens.find((t) =>
-          (t) => t.symbol.toLowerCase()?.includes(lowerCaseBaseSymbol),
+          t.symbol.toLowerCase()?.includes(lowerCaseBaseSymbol),
         )
       if (token) {
         return token.logoURI

pages/dashboard/index.tsx

@@ -825,11 +825,11 @@ const Dashboard: NextPage = () => {
                           ${
                             perpMarket.quoteLotSize
                           } quote (tick size: $${perpMarket.priceLotsToUi(
-                            new BN(1),
+                                    new BN(1),
-                          )}, 1 base lot: $${(
+                                  )}, 1 base lot: $${(
-                            perpMarket.baseLotsToUi(new BN(1)) *
+                                    perpMarket.baseLotsToUi(new BN(1)) *
-                            perpMarket.uiPrice
+                                    perpMarket.uiPrice
-                          ).toFixed(3)})`}
+                                  ).toFixed(3)})`}
                                 />
                                 <KeyValuePair
                                   label="Maint Asset/Liab Weight"
@@ -839,12 +839,14 @@ const Dashboard: NextPage = () => {
                           ${perpMarket.maintBaseLiabWeight.toFixed(
                             4,
                           )} (maint leverage: ${(
-                            1 /
+                                    1 /
-                            (perpMarket.maintBaseLiabWeight.toNumber() - 1)
+                                    (perpMarket.maintBaseLiabWeight.toNumber() -
-                          ).toFixed(2)}x, init leverage: ${(
+                                      1)
-                            1 /
+                                  ).toFixed(2)}x, init leverage: ${(
-                            (perpMarket.initBaseLiabWeight.toNumber() - 1)
+                                    1 /
-                          ).toFixed(2)}x)`}
+                                    (perpMarket.initBaseLiabWeight.toNumber() -
+                                      1)
+                                  ).toFixed(2)}x)`}
                                 />
                                 <KeyValuePair
                                   label="Init Asset/Liab Weight"

utils/governance/fetch/deposits.ts

@@ -85,7 +85,7 @@ export const getDeposits = async ({
             ...x,
             mint: mints[mintCfgs![x.votingMintConfigIdx].mint.toBase58()],
             index: idx,
-          }) as unknown as DepositWithMintAccount,
+          } as unknown as DepositWithMintAccount),
       )
       .filter((x) => typeof isUsed === 'undefined' || x.isUsed === isUsed)
     const usedDeposits = deposits.filter((x) => x.isUsed)

utils/governance/voteStakeRegistryClient.ts

@@ -7,10 +7,7 @@ export const DEFAULT_VSR_ID = new web3.PublicKey(
 )
 
 export class VsrClient {
-  constructor(
+  constructor(public program: Program<Idl>, public devnet?: boolean) {}
-    public program: Program<Idl>,
-    public devnet?: boolean,
-  ) {}
 
   static async connect(
     provider: Provider,

utils/kLineChart.ts

@@ -6,7 +6,7 @@ export const ONE_HOUR_SECONDS = ONE_HOUR_MINS * ONE_MINUTE_SECONDS
 export const ONE_DAY_SECONDS = ONE_HOUR_SECONDS * 24
 export type BASE_CHART_QUERY = {
   address: string
-  type: (typeof SUPPORTED_SPOT_RESOLUTIONS)[number]
+  type: typeof SUPPORTED_SPOT_RESOLUTIONS[number]
   time_to: number
 }
 export type CHART_QUERY = BASE_CHART_QUERY & {
@@ -16,7 +16,7 @@ export type CHART_QUERY = BASE_CHART_QUERY & {
 //Translate values that api accepts to chart seconds
 export const RES_NAME_TO_RES_VAL: {
   [key: string]: {
-    val: (typeof SUPPORTED_SPOT_RESOLUTIONS)[number]
+    val: typeof SUPPORTED_SPOT_RESOLUTIONS[number]
     seconds: number
   }
 } = {