feat: show and use the latest invitations

src/components/PsmPanel.tsx

@@ -11,7 +11,7 @@ import ProposeParamChange from './ProposeParamChange';
 import ProposePauseOffers from './ProposePauseOffers';
 import CharterGuidance from './CharterGuidance';
 import { useAtomValue } from 'jotai';
-import { walletUtilsAtom } from 'store/app';
+import { rpcUtilsAtom, walletUtilsAtom } from 'store/app';
 
 // TODO fetch list from RPC
 const anchors = [
@@ -44,6 +44,7 @@ export default function PsmPanel() {
   const [anchorName, setAnchorName] = useState(anchors[0]);
   const [proposalType, setProposalType] = useState(ProposalTypes.paramChange);
   const walletUtils = useAtomValue(walletUtilsAtom);
+  const rpcUtils = useAtomValue(rpcUtilsAtom);
   const { data: walletCurrent, status } = usePublishedDatum(
     walletUtils
       ? `wallet.${walletUtils.getWalletAddress()}.current`
@@ -54,6 +55,7 @@ export default function PsmPanel() {
     status,
     walletCurrent,
     charterInvitationSpec.description,
+    rpcUtils?.agoricNames.instance.econCommitteeCharter,
   );
 
   const previousOfferId = invitationStatus.acceptedIn;

src/components/VaultsPanel.tsx

@@ -14,7 +14,7 @@ import ChangeOracles, { ChangeOraclesMode } from './ChangeOracles';
 import PauseLiquidations from './PauseLiquidations';
 import AuctioneerParamChange from './AuctioneerParamChange';
 import { useAtomValue } from 'jotai';
-import { walletUtilsAtom } from 'store/app';
+import { walletUtilsAtom, rpcUtilsAtom } from 'store/app';
 
 const ProposalTypes = {
   addOracles: 'Add Oracle Operators',
@@ -36,6 +36,7 @@ export default function VaultsPanel() {
     ProposalTypes.managerParamChange,
   );
   const walletUtils = useAtomValue(walletUtilsAtom);
+  const rpcUtils = useAtomValue(rpcUtilsAtom);
   const filterProposals = networkProposalFilter(walletUtils);
 
   const { data: walletCurrent, status } = usePublishedDatum(
@@ -48,6 +49,7 @@ export default function VaultsPanel() {
     status,
     walletCurrent,
     charterInvitationSpec.description,
+    rpcUtils?.agoricNames.instance.econCommitteeCharter,
   );
   const charterOfferId = charterInvitationStatus.acceptedIn;
 

src/components/VotePanel.tsx

@@ -8,7 +8,7 @@ import { timestampPassed } from 'utils/helpers';
 import AcceptInvitation from './AcceptInvitation';
 import { OfferId, VoteOnQuestion } from './questions';
 import { useAtomValue } from 'jotai';
-import { walletUtilsAtom } from 'store/app';
+import { rpcUtilsAtom, walletUtilsAtom } from 'store/app';
 
 interface Props {}
 
@@ -90,6 +90,7 @@ function VoteOnQuestions(props: {
 
 export default function VotePanel(_props: Props) {
   const walletUtils = useAtomValue(walletUtilsAtom);
+  const rpcUtils = useAtomValue(rpcUtilsAtom);
   const { data, status } = usePublishedDatum(
     walletUtils
       ? `wallet.${walletUtils.getWalletAddress()}.current`
@@ -98,8 +99,12 @@ export default function VotePanel(_props: Props) {
   const { status: instanceStatus, data: instance } = usePublishedDatum(
     'agoricNames.instance',
   );
-
-  const invitationStatus = inferInvitationStatus(status, data, 'Voter');
+  const invitationStatus = inferInvitationStatus(
+    status,
+    data,
+    'Voter',
+    rpcUtils?.agoricNames.instance.economicCommittee,
+  );
   const previousOfferId = invitationStatus.acceptedIn;
 
   return (

src/lib/wallet.ts

@@ -429,6 +429,7 @@ export const inferInvitationStatus = (
   status: LoadStatus,
   current: CurrentWalletRecord | undefined,
   descriptionSubstr: string,
+  contractInstance,
 ) => {
   if (status === LoadStatus.Idle) {
     return { status: 'idle' };
@@ -440,24 +441,26 @@ export const inferInvitationStatus = (
   // first check for accepted
   const usedInvitationEntry = coerceEntries(current.offerToUsedInvitation).find(
     ([_, invitationAmount]) =>
-      invitationAmount.value[0].description.includes(descriptionSubstr),
+      invitationAmount.value[0].description.includes(descriptionSubstr) &&
+      invitationAmount.value[0].instance === contractInstance,
   );
   if (usedInvitationEntry) {
     return {
       status: 'accepted',
       acceptedIn: usedInvitationEntry[0],
     };
   }
-  // if that's not available, see if there's an invitation that can be used
 
+  // if that's not available, see if there's an invitation that can be used
   const invitationPurse = current.purses.find(p => {
     // xxx take this as param
     return p.brand.toString().includes('Invitation');
   });
-
   const invitation: Amount<'set'> | undefined =
-    invitationPurse.balance.value.find(a =>
-      a.description.includes(descriptionSubstr),
+    invitationPurse.balance.value.find(
+      a =>
+        a.description.includes(descriptionSubstr) &&
+        a.instance === contractInstance,
     );
   if (invitation) {
     return {