feat: mobile account switcher

mrgnlabs · Nov 23, 2023 · c3c0ffc · c3c0ffc · vercel · Nov 23, 2023
1 parent c17bdf3
commit c3c0ffc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/apps/marginfi-v2-ui/src/pages/index.tsx b/apps/marginfi-v2-ui/src/pages/index.tsx
@@ -116,6 +116,15 @@ const Home = () => {
 
       <Mobile>
         <PageHeader>lend</PageHeader>
+        {walletAddress && selectedAccount && marginfiAccounts.length > 1 && (
+          <MultipleAccountsBanner
+            selectedAccount={selectedAccount}
+            marginfiAccounts={marginfiAccounts}
+            fetchMrgnlendState={fetchMrgnlendState}
+            isRefreshing={isRefreshingStore}
+            setIsRefreshing={setIsRefreshingStore}
+          />
+        )}
         <div className="flex flex-col w-full h-full justify-start content-start pt-4 px-4 gap-4 mb-20">
           <MobileAssetsList />
         </div>
@@ -165,11 +174,11 @@ const MultipleAccountsBanner = ({
             }}
           >
             <SelectTrigger className="w-[180px]">{isRefreshing ? "Loading..." : shortAddress}</SelectTrigger>
-            <SelectContent>
+            <SelectContent className="w-full">
               <SelectGroup>
                 <SelectLabel>Accounts</SelectLabel>
                 {marginfiAccounts.map((account, index) => (
-                  <SelectItem key={index} value={account.address.toBase58()}>
+                  <SelectItem key={index} value={account.address.toBase58()} className="!text-xs">
                     {account.address.toBase58()}
                   </SelectItem>
                 ))}

diff --git a/packages/marginfi-client-v2/src/models/account/pure.ts b/packages/marginfi-client-v2/src/models/account/pure.ts
@@ -295,10 +295,8 @@ class MarginfiAccount {
     // ------------------------------------- //
     // collateral bank with positive weights //
     // ------------------------------------- //
-    console.log("here");
     // bypass volatility factor if no liabilities or if all collateral is untied
     if (liabilitiesInit.isZero() || initCollateralForBank.lte(freeCollateral)) {
-      console.log("aqui");
       return entireBalance;
     }