Merge branch 'feature/ui-tweaks' into develop

src/TokenTransferItem.tsx

@@ -20,32 +20,42 @@ const TokenTransferItem: React.FC<TokenTransferItemProps> = ({
     <span className="text-gray-500">
       <FontAwesomeIcon icon={faCaretRight} size="1x" />
     </span>
-    <span className="font-bold">From</span>
-    <AddressOrENSName address={t.from} />
-    <span className="font-bold">To</span>
-    <AddressOrENSName address={t.to} />
-    <span className="font-bold">For</span>
-    <span>
-      <FormattedBalance
-        value={t.value}
-        decimals={tokenMetas[t.token].decimals}
-      />
-    </span>
-    <span className="flex space-x-1 items-baseline truncate">
-      {tokenMetas[t.token] ? (
-        <>
-          <div className="self-center">
-            <TokenLogo address={t.token} name={tokenMetas[t.token].name} />
-          </div>
-          <AddressLink
-            address={t.token}
-            text={`${tokenMetas[t.token].name} (${tokenMetas[t.token].symbol})`}
+    <div className="grid grid-cols-5">
+      <div className="flex space-x-2">
+        <span className="font-bold">From</span>
+        <AddressOrENSName address={t.from} />
+      </div>
+      <div className="flex space-x-2">
+        <span className="font-bold">To</span>
+        <AddressOrENSName address={t.to} />
+      </div>
+      <div className="col-span-3 flex space-x-2">
+        <span className="font-bold">For</span>
+        <span>
+          <FormattedBalance
+            value={t.value}
+            decimals={tokenMetas[t.token].decimals}
           />
-        </>
-      ) : (
-        <AddressOrENSName address={t.token} />
-      )}
-    </span>
+        </span>
+        <span className="flex space-x-1 items-baseline truncate">
+          {tokenMetas[t.token] ? (
+            <>
+              <div className="self-center">
+                <TokenLogo address={t.token} name={tokenMetas[t.token].name} />
+              </div>
+              <AddressLink
+                address={t.token}
+                text={`${tokenMetas[t.token].name} (${
+                  tokenMetas[t.token].symbol
+                })`}
+              />
+            </>
+          ) : (
+            <AddressOrENSName address={t.token} />
+          )}
+        </span>
+      </div>
+    </div>
   </div>
 );
 

src/components/AddressLink.tsx

@@ -11,7 +11,7 @@ const AddressLink: React.FC<AddressLinkProps> = ({ address, text }) => (
     className="text-link-blue hover:text-link-blue-hover font-address truncate"
     to={`/address/${address}`}
   >
-    <p className="truncate" title={text}>
+    <p className="truncate" title={text ?? address}>
       {text ?? address}
     </p>
   </NavLink>