Merge branch 'main' into chore/sync-main

apps/trading/components/fees-container/fees-container.tsx

@@ -310,16 +310,25 @@ export const CurrentVolume = ({
   const t = useT();
   const nextTier = tiers[tierIndex + 1];
   const requiredForNextTier = nextTier
-    ? Number(nextTier.minimumRunningNotionalTakerVolume) - windowLengthVolume
+    ? new BigNumber(nextTier.minimumRunningNotionalTakerVolume).minus(
-    : 0;
+        windowLengthVolume
+      )
+    : new BigNumber(0);
+  const currentVolume = new BigNumber(windowLengthVolume);
 
   return (
     <div className="flex flex-col gap-3 pt-4">
       <CardStat
-        value={formatNumberRounded(new BigNumber(windowLengthVolume))}
+        value={
-        text={t('pastEpochs', 'Past {{count}} epochs', { count: windowLength })}
+          currentVolume.isZero()
+            ? `<${formatNumberRounded(requiredForNextTier)}`
+            : formatNumberRounded(currentVolume)
+        }
+        text={t('pastEpochs', 'Past {{count}} epochs', {
+          count: windowLength,
+        })}
       />
-      {requiredForNextTier > 0 && (
+      {requiredForNextTier.isGreaterThan(0) && (
         <CardStat
           value={formatNumber(requiredForNextTier)}
           text={t('Required for next tier')}

libs/liquidity/src/lib/liquidity-data-provider.spec.tsx

@@ -119,6 +119,8 @@ describe('getLiquidityProvision', () => {
         createdAt: '2022-12-16T09:28:29.071781Z',
         id: 'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
         fee: '0.001',
+        partyId:
+          'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
         party: {
           __typename: 'Party',
           accountsConnection: {

libs/liquidity/src/lib/liquidity-data-provider.ts

@@ -159,7 +159,14 @@ export const getLiquidityProvision = (
       const liquidityProvider = liquidityProviders.find(
         (f) => liquidityProvision.party.id === f.partyId
       );
-      if (!liquidityProvider) return liquidityProvision;
+
+      if (!liquidityProvider) {
+        return {
+          ...liquidityProvision,
+          partyId: liquidityProvision.party.id,
+        };
+      }
+
       const accounts = compact(
         liquidityProvision.party.accountsConnection?.edges
       ).map((e) => e.node);