Add USD value to AssetItem and rearrange columns

in CurrentDaoTreasuryAssets
terra-money · Nov 14, 2023 · 51181bb · 51181bb
1 parent 926e691
commit 51181bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/apps/enterprise/src/dao/components/TreasuryAssets/AssetItem.tsx b/apps/enterprise/src/dao/components/TreasuryAssets/AssetItem.tsx
@@ -54,7 +54,14 @@ export const AssetItem = ({ asset }: AssetItemProps) => {
             </Text>
           </VStack>
         </HStack>
-        <VStack gap={4}>
+        {!!asset.usd ? (
+          <Text weight="semibold">${formatAmount(asset.usd)}</Text>
+        ) : (
+          <Text color="supporting" weight="semibold">
+            -
+          </Text>
+        )}
+        <VStack alignItems="end" gap={4}>
           {!!asset.usd ? (
             <Text weight="semibold">${formatAmount(getAssetBalanceInUsd(asset))}</Text>
           ) : (
@@ -66,14 +73,6 @@ export const AssetItem = ({ asset }: AssetItemProps) => {
             {formatAmount(fromChainAmount(asset.balance, asset.decimals))} {asset.symbol}
           </Text>
         </VStack>
-
-        {!!asset.usd ? (
-          <Text weight="semibold">${formatAmount(asset.usd)}</Text>
-        ) : (
-          <Text color="supporting" weight="semibold">
-            -
-          </Text>
-        )}
       </AssetItemFrame>
     </Container>
   );

diff --git a/apps/enterprise/src/dao/components/TreasuryAssets/CurrentDaoTreasuryAssets.tsx b/apps/enterprise/src/dao/components/TreasuryAssets/CurrentDaoTreasuryAssets.tsx
@@ -34,8 +34,8 @@ export const CurrentDaoTreasuryAssets = () => {
         <VStack gap={20}>
           <Header>
             <Text>Asset</Text>
-            <Text>Amount</Text>
             <Text>Price</Text>
+            <Text>Amount</Text>
           </Header>
           <VStack gap={16}>
             {assets.map((asset, index) => (