Fix collectives payment info

opensquare-network · Apr 7, 2024 · b112bf0 · b112bf0
1 parent 625d3ed
commit b112bf0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/packages/next-common/components/fellowship/salary/cycles/tabsList/columns/payment.jsx b/packages/next-common/components/fellowship/salary/cycles/tabsList/columns/payment.jsx
@@ -2,10 +2,20 @@ import dayjs from "dayjs";
 import Descriptions from "next-common/components/Descriptions";
 import AddressUser from "next-common/components/user/addressUser";
 import ValueDisplay from "next-common/components/valueDisplay";
-import { useChainSettings } from "next-common/context/chain";
 import { cn, toPrecision } from "next-common/utils";
+import { useSalaryAsset } from "next-common/hooks/useSalaryAsset";
 
 const subColumns = [
+  {
+    name: "id",
+    cellRender(data) {
+      if (!data?.paymentId) {
+        return null;
+      }
+
+      return data.paymentId;
+    },
+  },
   {
     name: "beneficiary",
     cellRender(data) {
@@ -26,9 +36,8 @@ const subColumns = [
       return <AmountValue data={data} />;
     },
   },
-  // FIXME: cycle, registrations paymentID
   {
-    name: "indexer",
+    name: "time",
     cellRender(data) {
       if (!data?.paidIndexer) {
         return null;
@@ -92,7 +101,7 @@ function BeneficiaryValue({ data }) {
 }
 
 function AmountValue({ data }) {
-  const { decimals, symbol } = useChainSettings();
+  const { decimals, symbol } = useSalaryAsset();
 
   return (
     <ValueDisplay value={toPrecision(data?.amount, decimals)} symbol={symbol} />

diff --git a/packages/next-common/components/fellowship/salary/feeds/events/paid.js b/packages/next-common/components/fellowship/salary/feeds/events/paid.js
@@ -12,7 +12,7 @@ export default function FellowshipSalaryPaidFeed({ feed = {} }) {
     <>
       <AddressUser key={who} add={who} noTooltip />
       <span>
-        &nbsp;was
+        &nbsp;was&nbsp;
         <FellowshipFeedEventLabel>Paid</FellowshipFeedEventLabel>
         &nbsp;
         <FellowshipFeedEventLabel>