From 51181bb1c54275558193cb2b4b02ec059198bc91 Mon Sep 17 00:00:00 2001
From: Rodion Chachura <geekrodion@gmail.com>
Date: Tue, 14 Nov 2023 12:43:33 +0400
Subject: [PATCH] Add USD value to AssetItem and rearrange columns in
 CurrentDaoTreasuryAssets

---
 .../dao/components/TreasuryAssets/AssetItem.tsx | 17 ++++++++---------
 .../TreasuryAssets/CurrentDaoTreasuryAssets.tsx |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/enterprise/src/dao/components/TreasuryAssets/AssetItem.tsx b/apps/enterprise/src/dao/components/TreasuryAssets/AssetItem.tsx
index af99e557..a9ccca74 100644
--- 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
index 10e4ef22..0a44e26d 100644
--- 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) => (