chore: ledger entries refactor - further feedback adjustments

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

@@ -3,16 +3,27 @@ import { LedgerExportForm } from '@vegaprotocol/ledger';
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useEnvironment } from '@vegaprotocol/environment';
-import { useAssetsDataProvider } from '@vegaprotocol/assets';
+import type { PartyAssetFieldsFragment } from '@vegaprotocol/assets';
+import { usePartyAssetsQuery } from '@vegaprotocol/assets';
 
 export const LedgerContainer = () => {
   const { pubKey } = useVegaWallet();
   const VEGA_URL = useEnvironment((store) => store.VEGA_URL);
-  const { data, loading } = useAssetsDataProvider();
-  const assets = (data || []).reduce((aggr, item) => {
-    aggr[item.id] = item.symbol;
-    return aggr;
-  }, {} as Record<string, string>);
+  const { data, loading } = usePartyAssetsQuery({
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+  const assets = (data?.party?.accountsConnection?.edges ?? [])
+    .map<PartyAssetFieldsFragment>(
+      (item) => item?.node?.asset ?? ({} as PartyAssetFieldsFragment)
+    )
+    .reduce((aggr, item) => {
+      if ('id' in item && 'symbol' in item) {
+        aggr[item.id as string] = item.symbol as string;
+      }
+      return aggr;
+    }, {} as Record<string, string>);
+
   if (!pubKey) {
     return (
       <Splash>

libs/assets/src/lib/Assets.graphql

@@ -24,3 +24,26 @@ query Assets {
     }
   }
 }
+
+fragment PartyAssetFields on Asset {
+  id
+  name
+  symbol
+  status
+}
+
+query PartyAssets($partyId: ID!) {
+  party(id: $partyId) {
+    id
+    accountsConnection {
+      edges {
+        node {
+          type
+          asset {
+            ...PartyAssetFields
+          }
+        }
+      }
+    }
+  }
+}

libs/assets/src/lib/__generated__/Assets.ts

@@ -10,6 +10,15 @@ export type AssetsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 export type AssetsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string, status: Types.AssetStatus, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string } } } | null> | null } | null };
 
+export type PartyAssetFieldsFragment = { __typename?: 'Asset', id: string, name: string, symbol: string, status: Types.AssetStatus };
+
+export type PartyAssetsQueryVariables = Types.Exact<{
+  partyId: Types.Scalars['ID'];
+}>;
+
+
+export type PartyAssetsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, asset: { __typename?: 'Asset', id: string, name: string, symbol: string, status: Types.AssetStatus } } } | null> | null } | null } | null };
+
 export const AssetListFieldsFragmentDoc = gql`
     fragment AssetListFields on Asset {
   id
@@ -28,6 +37,14 @@ export const AssetListFieldsFragmentDoc = gql`
   status
 }
     `;
+export const PartyAssetFieldsFragmentDoc = gql`
+    fragment PartyAssetFields on Asset {
+  id
+  name
+  symbol
+  status
+}
+    `;
 export const AssetsDocument = gql`
     query Assets {
   assetsConnection {
@@ -65,4 +82,49 @@ export function useAssetsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<Ass
         }
 export type AssetsQueryHookResult = ReturnType<typeof useAssetsQuery>;
 export type AssetsLazyQueryHookResult = ReturnType<typeof useAssetsLazyQuery>;
-export type AssetsQueryResult = Apollo.QueryResult<AssetsQuery, AssetsQueryVariables>;
+export type AssetsQueryResult = Apollo.QueryResult<AssetsQuery, AssetsQueryVariables>;
+export const PartyAssetsDocument = gql`
+    query PartyAssets($partyId: ID!) {
+  party(id: $partyId) {
+    id
+    accountsConnection {
+      edges {
+        node {
+          type
+          asset {
+            ...PartyAssetFields
+          }
+        }
+      }
+    }
+  }
+}
+    ${PartyAssetFieldsFragmentDoc}`;
+
+/**
+ * __usePartyAssetsQuery__
+ *
+ * To run a query within a React component, call `usePartyAssetsQuery` and pass it any options that fit your needs.
+ * When your component renders, `usePartyAssetsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = usePartyAssetsQuery({
+ *   variables: {
+ *      partyId: // value for 'partyId'
+ *   },
+ * });
+ */
+export function usePartyAssetsQuery(baseOptions: Apollo.QueryHookOptions<PartyAssetsQuery, PartyAssetsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<PartyAssetsQuery, PartyAssetsQueryVariables>(PartyAssetsDocument, options);
+      }
+export function usePartyAssetsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PartyAssetsQuery, PartyAssetsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<PartyAssetsQuery, PartyAssetsQueryVariables>(PartyAssetsDocument, options);
+        }
+export type PartyAssetsQueryHookResult = ReturnType<typeof usePartyAssetsQuery>;
+export type PartyAssetsLazyQueryHookResult = ReturnType<typeof usePartyAssetsLazyQuery>;
+export type PartyAssetsQueryResult = Apollo.QueryResult<PartyAssetsQuery, PartyAssetsQueryVariables>;

libs/ledger/src/lib/ledger-export-form.tsx

@@ -64,7 +64,7 @@ export const LedgerExportForm = ({ partyId, vegaUrl, assets }: Props) => {
   const assetDropDown = (
     <TradingSelect
       id="select-ledger-asset"
-      value={assets[assetId]}
+      value={assetId}
       onChange={(e) => {
         setAssetId(e.target.value);
       }}

libs/types/src/__generated__/types.ts

@@ -4414,6 +4414,8 @@ export type StopOrderFilter = {
   dateRange?: InputMaybe<DateRange>;
   /** Zero or more expiry strategies to filter by */
   expiryStrategy?: InputMaybe<Array<StopOrderExpiryStrategy>>;
+  /** Filter for live stop orders only */
+  liveOnly?: InputMaybe<Scalars['Boolean']>;
   /** Zero or more market IDs to filter by */
   markets?: InputMaybe<Array<Scalars['ID']>>;
   /** Zero or more party IDs to filter by */