Merge branch 'develop' into preview

consolelabs · Jul 9, 2024 · 5d5c9d2 · 5d5c9d2
2 parents 5a1c766 + d4b2821
commit 5d5c9d2
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 15 deletions.
diff --git a/src/adapters/mochi-pay.ts b/src/adapters/mochi-pay.ts
@@ -343,11 +343,12 @@ class MochiPay extends Fetcher {
 
   async listEarningVaults(
     profileId: string,
+    guildId: string,
     fetchTradeDetails = false,
   ): Promise<any> {
     const { data: res, ok } = await this.jsonFetch(
       `${MOCHI_PAY_API_BASE_URL}/profiles/${profileId}/syndicates/earning-vaults`,
-      { query: { fetchTradeDetails } },
+      { query: { fetchTradeDetails, guildId } },
     )
     let data = []
     if (ok) {

diff --git a/src/commands/vault/info/processor.ts b/src/commands/vault/info/processor.ts
@@ -314,21 +314,35 @@ export async function runGetVaultDetail({
       })}`,
     ].join("\n")
 
+    let share = report.vault_equity.stake_percent
+    let claiambleInfo = utils.formatUsdPriceDigit({
+      value: Number(report.vault_equity.claimable ?? 0),
+      shorten: false,
+    })
+    if (report.member_equity) {
+      const { claimable, claimable_usd, token_symbol } = report.member_equity
+      share = report.member_equity.share * 100
+      claiambleInfo = `${utils.formatTokenDigit(
+        claimable,
+      )} ${token_symbol} (≈ ${utils.formatUsdPriceDigit({
+        value: claimable_usd,
+        shorten: false,
+      })})`
+    }
+
     const vaultEquity = [
       "**Vault equity**",
       `${getVaultEquityEmoji(
-        report.vault_equity.stake_percent,
-      )} \`Your share.       \` ${utils.formatPercentDigit(
-        Number(report.vault_equity.stake_percent),
-      )}`,
+        share,
+      )} \`Your share.       \` ${utils.formatPercentDigit({
+        value: Number(share),
+        fractionDigits: 4,
+      })}`,
       `${getEmoji("GIFT")} \`Floating profit.  \` ${utils.formatUsdPriceDigit({
         value: Number(report.vault_equity.floating_profit ?? 0),
         shorten: false,
       })}`,
-      `:tada: \`Claimable amount. \` ${utils.formatUsdPriceDigit({
-        value: Number(report.vault_equity.claimable ?? 0),
-        shorten: false,
-      })}`,
+      `:tada: \`Claimable amount. \` ${claiambleInfo}`,
     ].join("\n")
 
     const openTrades = open_trades
@@ -433,7 +447,8 @@ export async function runGetVaultDetail({
               .setLabel("Claim")
               .setStyle("SECONDARY")
               .setCustomId("claim")
-              .setEmoji("<:FeelsGood:1177549805048836126>"),
+              .setEmoji("<:FeelsGood:1177549805048836126>")
+              .setDisabled(Number(report.vault_equity.claimable ?? 0) > 0),
             new MessageButton()
               .setLabel("Report")
               .setEmoji(getEmoji("CHART"))

diff --git a/src/commands/vault/info/slash.ts b/src/commands/vault/info/slash.ts
@@ -124,7 +124,7 @@ const command: SlashCommand = {
     const userProfile = await profile.getByDiscord(i.user.id)
     const [spotVaults, tradingVaults] = await Promise.all([
       i.guildId ? config.vaultList(i.guildId, true) : [],
-      mochiPay.listEarningVaults(userProfile.id),
+      i.guildId ? mochiPay.listEarningVaults(userProfile.id, i.guildId) : [],
     ])
 
     const options = [

diff --git a/src/commands/vault/list/processor.ts b/src/commands/vault/list/processor.ts
@@ -69,7 +69,13 @@ export async function runVaultList(
     : await config.vaultList("", false, userProfile.id)
 
   const tradingVaults = (
-    await mochiPay.listEarningVaults(userProfile.id, true)
+    interaction.guildId
+      ? await mochiPay.listEarningVaults(
+          userProfile.id,
+          interaction.guildId,
+          true,
+        )
+      : []
   ).map((v: any) => ({
     id: v.id,
     name: v.name,

diff --git a/src/commands/vault/list/slash.ts b/src/commands/vault/list/slash.ts
@@ -4,7 +4,7 @@ import { SlashCommand } from "types/common"
 import { GM_GITBOOK, SLASH_PREFIX } from "utils/constants"
 import { composeEmbedMessage2 } from "ui/discord/embed"
 import { runVaultList } from "./processor"
-import { MachineConfig, route } from "utils/router"
+import { route } from "utils/router"
 import { machineConfig } from "commands/vault/info/slash"
 
 const command: SlashCommand = {
@@ -16,7 +16,7 @@ const command: SlashCommand = {
       .setDescription("Show current vault")
   },
   run: async function (interaction: CommandInteraction) {
-    const { initial, msgOpts } = await runVaultList(interaction)
+    const { msgOpts } = await runVaultList(interaction)
     const reply = (await interaction.editReply(msgOpts)) as Message
 
     route(

diff --git a/src/commands/vault/view/slash.ts b/src/commands/vault/view/slash.ts
@@ -35,7 +35,7 @@ const command: SlashCommand = {
     const userProfile = await profile.getByDiscord(i.user.id)
     const [spotVaults, tradingVaults] = await Promise.all([
       config.vaultList(i.guildId, true),
-      mochiPay.listEarningVaults(userProfile.id),
+      mochiPay.listEarningVaults(userProfile.id, i.guildId),
     ])
 
     const options = [