Merge branch 'dev'

src/components/MemoViewComponent.tsx

@@ -36,13 +36,12 @@ export const MemoViewComponent: React.FC<MemoViewComponentProps> = ({
 
 	return (
 		<div className='flex flex-col p-[16px] gap-y-[16px] w-[800px] bg-brown rounded-[10px]'>
-			{memoText === 'Encrypted' ? (
-				<ActionCell title='Sender Address'>
-					<Copy text={memoSender} type='last' />
-				</ActionCell>
-			) : (
-				<ActionCell title='Message'>{memoText}</ActionCell>
-			)}
+			<ActionCell
+				title={memoText === 'Encrypted' ? 'Sender Address' : 'Message'}
+				isEncrypted={memoText === 'Encrypted'}
+			>
+				{memoText}
+			</ActionCell>
 			<ActionCell
 				title='Return Address'
 				isEncrypted={memoSender === 'Encrypted'}

src/components/penumbra/view/SwapView.tsx

@@ -6,6 +6,7 @@ import { UNKNOWN_ASSET_PREFIX } from '@/lib/constants'
 import { uint8ToBase64 } from '@/lib/uint8ToBase64'
 import {
 	SwapView,
+	SwapView_Opaque,
 	SwapView_Visible,
 } from '@buf/penumbra-zone_penumbra.bufbuild_es/penumbra/core/dex/v1alpha1/dex_pb'
 import { bech32m } from 'bech32'
@@ -76,6 +77,33 @@ export const SwapViewComponent: React.FC<{ view: SwapView }> = ({ view }) => {
 				</ActionCell>
 			)
 		}
+		case 'opaque': {
+			const opaqueSwap: SwapView_Opaque = view.swapView.value
+
+			const asset1Id = opaqueSwap.swap?.body?.tradingPair?.asset1
+			const asset1 = getAssetByAssetId(assets, uint8ToBase64(asset1Id!.inner!))
+			const asset1Amount = opaqueSwap.swap?.body?.delta1I
+			const { asssetHumanDenom: assset1HumanDenom } = getHumanReadableValue(
+				asset1,
+				asset1Amount,
+				asset1Id!
+			)
+
+			const asset2Id = opaqueSwap.swap?.body?.tradingPair?.asset2
+			const asset2 = getAssetByAssetId(assets, uint8ToBase64(asset2Id!.inner!))
+			const asset2Amount = opaqueSwap.swap?.body?.delta2I
+			const { asssetHumanDenom: assset2HumanDenom } = getHumanReadableValue(
+				asset2,
+				asset2Amount,
+				asset2Id!
+			)
+
+			return (
+				<ActionCell title='Swap'>
+					{`Opaque swap for trading pair: ${assset1HumanDenom} <=> ${assset2HumanDenom}`}
+				</ActionCell>
+			)
+		}
 		default: {
 			return <ActionCell title='Swap' isEncrypted={true} />
 		}

src/lib/assets.ts

@@ -45,11 +45,9 @@ export const getHumanReadableValue = (
 				?.exponent || 0
 	}
 
-	const assetHumanAmount = calculateAmount(
-		Number(amount?.lo),
-		Number(amount?.hi),
-		assetExponent
-	)
+	const assetHumanAmount = amount
+		? calculateAmount(Number(amount?.lo), Number(amount?.hi), assetExponent)
+		: 0
 
 	return {
 		assetHumanAmount,