fix: use getters and fix lint errors

penumbra-zone · Oct 24, 2024 · a5f821e · a5f821e
1 parent d2a7ed9
commit a5f821e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/components/Deposit.tsx b/components/Deposit.tsx
@@ -1,5 +1,9 @@
 import { client } from '@/components/penumbra';
 import { useQuestStore } from '@/components/store';
+import {
+  getAmountFromRecord,
+  getAssetIdFromRecord,
+} from '@penumbra-zone/getters/spendable-note-record';
 import { ViewService } from '@penumbra-zone/protobuf';
 import { ValueView } from '@penumbra-zone/protobuf/penumbra/core/asset/v1/asset_pb';
 import type { CommitmentSource_Ics20Transfer } from '@penumbra-zone/protobuf/penumbra/core/component/sct/v1/sct_pb';
@@ -51,7 +55,7 @@ const Deposit: React.FC = () => {
       const deposits = await Promise.all(
         depositNotes.map(async (note) => {
           const metadata = await client.service(ViewService).assetMetadataById({
-            assetId: note.noteRecord?.note?.value?.assetId!,
+            assetId: getAssetIdFromRecord(note.noteRecord),
           });
 
           return {
@@ -62,7 +66,7 @@ const Deposit: React.FC = () => {
                 case: 'knownAssetId',
                 value: {
                   metadata: metadata.denomMetadata!,
-                  amount: note?.noteRecord?.note?.value?.amount!,
+                  amount: getAmountFromRecord(note.noteRecord),
                 },
               },
             }),

diff --git a/components/Staking.tsx b/components/Staking.tsx
@@ -1,10 +1,12 @@
 import { bech32mIdentityKey } from '@penumbra-zone/bech32m/penumbravalid';
 import {
+  getBalanceView,
   getMetadataFromBalancesResponse,
   getValueViewCaseFromBalancesResponse,
 } from '@penumbra-zone/getters/balances-response';
 import {
   getAmount,
+  getEquivalentValues,
   getExtendedMetadata,
   getSymbolFromValueView,
 } from '@penumbra-zone/getters/value-view';
@@ -149,10 +151,7 @@ const Staking: React.FC = () => {
           >
             {delegationTokens?.map((balance) => {
               const validator = validators?.find((validator) =>
-                (
-                  balance?.balanceView?.valueView
-                    ?.value as ValueView_KnownAssetId
-                )?.metadata?.base?.includes(
+                getMetadataFromBalancesResponse(balance).base?.includes(
                   bech32mIdentityKey({
                     ik:
                       validator?.validator?.identityKey?.ik ?? new Uint8Array(),
@@ -171,14 +170,12 @@ const Staking: React.FC = () => {
                         new ValueView({
                           valueView: {
                             value: new ValueView_KnownAssetId({
-                              amount: (
-                                balance?.balanceView?.valueView
-                                  ?.value as ValueView_KnownAssetId
-                              )?.equivalentValues[0]?.equivalentAmount,
-                              metadata: (
-                                balance?.balanceView?.valueView
-                                  ?.value as ValueView_KnownAssetId
-                              )?.equivalentValues[0]?.numeraire,
+                              amount:
+                                getBalanceView.pipe(getEquivalentValues)()[0]
+                                  .equivalentAmount,
+                              metadata:
+                                getBalanceView.pipe(getEquivalentValues)()[0]
+                                  .numeraire,
                             }),
                             case: 'knownAssetId',
                           },