update optional getters

prax-wallet · Sep 5, 2024 · 89825c5 · 89825c5
1 parent b14f093
commit 89825c5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/packages/ui/components/ui/asset-icon/index.tsx b/packages/ui/components/ui/asset-icon/index.tsx
@@ -22,7 +22,7 @@ export const AssetIcon = ({
     size === 'sm' && 'size-6',
     size === 'lg' && 'size-12',
   );
-  const display = getDisplay.optional()(metadata);
+  const display = getDisplay.optional(metadata);
   const isDelegationToken = display ? assetPatterns.delegationToken.matches(display) : false;
   const isUnbondingToken = display ? assetPatterns.unbondingToken.matches(display) : false;
 

diff --git a/packages/ui/components/ui/tx/actions-views/delegator-vote.tsx b/packages/ui/components/ui/tx/actions-views/delegator-vote.tsx
@@ -54,11 +54,11 @@ const umValueView = (amount?: Amount) => {
 };
 
 export const DelegatorVoteComponent = ({ value }: { value: DelegatorVoteView }) => {
-  const body = getDelegatorVoteBody.optional()(value);
+  const body = getDelegatorVoteBody.optional(value);
 
   if (value.delegatorVote.case === 'visible') {
     const note = value.delegatorVote.value.note;
-    const address = getAddress.optional()(note);
+    const address = getAddress.optional(note);
 
     return (
       <ViewBox

diff --git a/packages/ui/components/ui/tx/actions-views/swap/index.tsx b/packages/ui/components/ui/tx/actions-views/swap/index.tsx
@@ -21,8 +21,8 @@ export const SwapViewComponent = ({
   feeValueView: ValueView;
 }) => {
   if (value.swapView.case === 'visible') {
-    const claimTx = getClaimTx.optional()(value);
-    const addressView = getAddressView.optional()(value);
+    const claimTx = getClaimTx.optional(value);
+    const addressView = getAddressView.optional(value);
     const oneWaySwap = isOneWaySwap(value) ? getOneWaySwapValues(value) : undefined;
 
     // The 'Fee' protobuf definition does not include assetMetadata.

diff --git a/packages/ui/components/ui/tx/actions-views/swap/one-way-swap.tsx b/packages/ui/components/ui/tx/actions-views/swap/one-way-swap.tsx
@@ -10,7 +10,7 @@ import { getAmount } from '@penumbra-zone/getters/value-view';
  * 1.23INPUT -> 4.56OUTPUT
  */
 export const OneWaySwap = ({ input, output }: { input: ValueView; output: ValueView }) => {
-  const outputAmount = getAmount.optional()(output);
+  const outputAmount = getAmount.optional(output);
 
   return (
     <div className='flex items-center gap-2'>

diff --git a/packages/ui/components/ui/tx/actions-views/swap/swap-claim.tsx b/packages/ui/components/ui/tx/actions-views/swap/swap-claim.tsx
@@ -3,8 +3,8 @@ import { SwapClaimView } from '@penumbra-zone/protobuf/penumbra/core/component/d
 import { TransactionIdComponent } from './transaction-id';
 import { ActionDetails } from '../action-details';
 import {
-  getOutput1ValueOptional,
-  getOutput2ValueOptional,
+  getOutput1Value,
+  getOutput2Value,
   getSwapClaimFee,
 } from '@penumbra-zone/getters/swap-claim-view';
 import { getAmount } from '@penumbra-zone/getters/value-view';
@@ -30,10 +30,10 @@ const getClaimLabel = (
 export const SwapClaimViewComponent = ({ value }: { value: SwapClaimView }) => {
   if (value.swapClaimView.case === 'visible') {
     const swapTxId = value.swapClaimView.value.swapTx;
-    const output1Value = getOutput1ValueOptional(value);
-    const output2Value = getOutput2ValueOptional(value);
-    const output1Amount = getAmount.optional()(output1Value);
-    const output2Amount = getAmount.optional()(output2Value);
+    const output1Value = getOutput1Value(value);
+    const output2Value = getOutput2Value(value);
+    const output1Amount = getAmount.optional(output1Value);
+    const output2Amount = getAmount.optional(output2Value);
     const claimLabel = getClaimLabel(output1Amount, output2Amount);
 
     return (

diff --git a/packages/ui/components/ui/tx/dutch-auction-component/expanded-details/get-price.ts b/packages/ui/components/ui/tx/dutch-auction-component/expanded-details/get-price.ts
@@ -46,7 +46,7 @@ export const getPrice = (
   // The input, scaled up by `step_count` to match.
   const inputScaled = (stepCount - 1n) * input;
 
-  const inputDisplayDenomExponent = getDisplayDenomExponent.optional()(inputMetadata);
+  const inputDisplayDenomExponent = getDisplayDenomExponent.optional(inputMetadata);
   const multiplier = 10 ** (inputDisplayDenomExponent ?? 0);
   const price = Math.round((Number(targetOutputScaled) / Number(inputScaled)) * multiplier);
 

diff --git a/packages/ui/components/ui/tx/dutch-auction-component/expanded-details/index.tsx b/packages/ui/components/ui/tx/dutch-auction-component/expanded-details/index.tsx
@@ -41,8 +41,8 @@ export const ExpandedDetails = ({
     fullSyncHeight >= description.startHeight &&
     fullSyncHeight <= description.endHeight;
 
-  const inputExponent = getDisplayDenomExponent.optional()(inputMetadata);
-  const outputExponent = getDisplayDenomExponent.optional()(outputMetadata);
+  const inputExponent = getDisplayDenomExponent.optional(inputMetadata);
+  const outputExponent = getDisplayDenomExponent.optional(outputMetadata);
 
   return (
     <div className='flex w-full flex-col overflow-hidden'>