fix: resolved merge conflicts

mrgnlabs · Oct 31, 2024 · e493a5b · e493a5b
1 parent 56f3b75
commit e493a5b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 18 deletions.
diff --git a/apps/marginfi-v2-ui/src/components/common/Navbar/Navbar.tsx b/apps/marginfi-v2-ui/src/components/common/Navbar/Navbar.tsx
@@ -4,14 +4,10 @@ import Link from "next/link";
 import Image from "next/image";
 import { useRouter } from "next/router";
 
-import { PublicKey } from "@solana/web3.js";
 import { IconBell, IconBrandTelegram, IconSettings } from "@tabler/icons-react";
-import { IconBell, IconBrandTelegram } from "@tabler/icons-react";
 
-import { collectRewardsBatch, capture, cn } from "@mrgnlabs/mrgn-utils";
-import { Settings, Wallet } from "@mrgnlabs/mrgn-ui";
 import { capture, cn } from "@mrgnlabs/mrgn-utils";
-import { Wallet } from "@mrgnlabs/mrgn-ui";
+import { Settings, Wallet } from "@mrgnlabs/mrgn-ui";
 
 import { useMrgnlendStore, useUiStore, useUserProfileStore } from "~/store";
 import { useFirebaseAccount } from "~/hooks/useFirebaseAccount";
@@ -60,7 +56,6 @@ export const Navbar: FC = () => {
       setTransactionSettings: state.setTransactionSettings,
     })
   );
-  const [isOraclesStale] = useUiStore((state) => [state.isOraclesStale, state.priorityFee]);
 
   const [userPointsData] = useUserProfileStore((state) => [state.userPointsData]);
 

diff --git a/...infi-v2-ui/src/components/common/Portfolio/components/asset-card/portfolio-asset-card.tsx b/...infi-v2-ui/src/components/common/Portfolio/components/asset-card/portfolio-asset-card.tsx
@@ -3,7 +3,6 @@ import React from "react";
 import Image from "next/image";
 import { IconAlertTriangle } from "@tabler/icons-react";
 
-import { IconAlertTriangle } from "@tabler/icons-react";
 import { usdFormatter, numeralFormatter, dynamicNumeralFormatter } from "@mrgnlabs/mrgn-common";
 import { ActiveBankInfo, ActionType, ExtendedBankInfo } from "@mrgnlabs/marginfi-v2-ui-state";
 import { capture } from "@mrgnlabs/mrgn-utils";

diff --git a/packages/marginfi-client-v2/src/models/account/wrapper.ts b/packages/marginfi-client-v2/src/models/account/wrapper.ts
@@ -1071,9 +1071,16 @@ class MarginfiAccountWrapper {
     );
   }
 
-  async makeWithdrawEmissionsTx(bankAddresses: PublicKey[]): Promise<VersionedTransaction> {
-    const bundleTipIx = makeBundleTipIx(this.client.provider.publicKey);
-    const priorityFeeIx = this.makePriorityFeeIx(0); // TODO: set priorityfee
+  async makeWithdrawEmissionsTx(
+    bankAddresses: PublicKey[],
+    priorityFeeUi?: number,
+    broadcastType: TransactionBroadcastType = "BUNDLE"
+  ): Promise<VersionedTransaction> {
+    const { bundleTipIx, priorityFeeIx } = makeTxPriorityIx(
+      this.client.provider.publicKey,
+      priorityFeeUi,
+      broadcastType
+    );
     const blockhash = (await this._program.provider.connection.getLatestBlockhash()).blockhash;
 
     const ixs: TransactionInstruction[] = [];
@@ -1087,7 +1094,7 @@ class MarginfiAccountWrapper {
 
     return new VersionedTransaction(
       new TransactionMessage({
-        instructions: [bundleTipIx, ...priorityFeeIx, ...ixs],
+        instructions: [priorityFeeIx, ...(bundleTipIx ? [bundleTipIx] : []), ...ixs],
         payerKey: this.authority,
         recentBlockhash: blockhash,
       }).compileToV0Message()

diff --git a/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx b/packages/mrgn-ui/src/components/action-box-v2/actions/lend-box/lend-box.tsx
@@ -11,9 +11,15 @@ import {
   computeAccountSummary,
   DEFAULT_ACCOUNT_SUMMARY,
 } from "@mrgnlabs/marginfi-v2-ui-state";
-import { ActionMethod, MarginfiActionParams, PreviousTxn, useConnection, usePriorityFee } from "@mrgnlabs/mrgn-utils";
-import { ActionMessageType, checkLendActionAvailable, MarginfiActionParams, PreviousTxn } from "@mrgnlabs/mrgn-utils";
+
 import { MarginfiAccountWrapper, MarginfiClient } from "@mrgnlabs/marginfi-client-v2";
+import {
+  ActionMessageType,
+  checkLendActionAvailable,
+  MarginfiActionParams,
+  PreviousTxn,
+  usePriorityFee,
+} from "@mrgnlabs/mrgn-utils";
 
 import { ActionButton } from "~/components/action-box-v2/components";
 

diff --git a/packages/mrgn-ui/src/components/action-box-v2/actions/repay-collat-box/repay-collat-box.tsx b/packages/mrgn-ui/src/components/action-box-v2/actions/repay-collat-box/repay-collat-box.tsx
@@ -14,6 +14,7 @@ import {
   MarginfiActionParams,
   PreviousTxn,
   showErrorToast,
+  usePriorityFee,
 } from "@mrgnlabs/mrgn-utils";
 import { MarginfiAccountWrapper, MarginfiClient } from "@mrgnlabs/marginfi-client-v2";
 

diff --git a/packages/mrgn-ui/src/components/action-box-v2/actions/stake-box/stake-box.tsx b/packages/mrgn-ui/src/components/action-box-v2/actions/stake-box/stake-box.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React from "react";
 
 import { WalletContextState } from "@solana/wallet-adapter-react";
 
@@ -10,17 +10,18 @@ import { nativeToUi, NATIVE_MINT as SOL_MINT, uiToNative } from "@mrgnlabs/mrgn-
 import { useActionAmounts } from "~/components/action-box-v2/hooks";
 import { WalletContextStateOverride } from "~/components/wallet-v2/hooks/use-wallet.hook";
 import { ActionMessage } from "~/components";
+import { usePriorityFee } from "~/hooks";
+
+import { useActionBoxStore } from "../../store";
+import { ActionButton, ActionSettingsButton } from "../../components";
+import { useActionContext, useStakeBoxContext } from "../../contexts";
 
 import { useStakeBoxStore } from "./store";
 import { AmountPreview } from "./components/amount-preview";
-import { ActionButton, ActionSettingsButton } from "../../components";
 import { StatsPreview } from "./components/stats-preview";
 import { useStakeSimulation } from "./hooks";
-import { useActionBoxStore } from "../../store";
 import { handleExecuteLstAction } from "./utils/stake-action.utils";
 import { ActionInput } from "./components/action-input";
-import { checkActionAvailable } from "./utils";
-import { useActionContext, useStakeBoxContext } from "../../contexts";
 
 export type StakeBoxProps = {
   nativeSolBalance: number;