diff --git a/desk/app/treaty.hoon b/desk/app/treaty.hoon index 0b040cac..37c2f579 100644 --- a/desk/app/treaty.hoon +++ b/desk/app/treaty.hoon @@ -111,6 +111,17 @@ ::NOTE this assumes that all treaties in sovereign are also :: present in the treaties map (fact-init:io (treaty-update:cg:cc %ini treaties))^~ + :: + [%treaties @ ~] + :_ this + =/ =ship (slav %p i.t.path) + =/ alliance (~(get ju allies) ship) + =/ allied + %- ~(gas by *(map [^ship desk] treaty)) + %+ skim ~(tap by treaties) + |= [ref=[^ship desk] =treaty] + (~(has in alliance) ref) + (fact-init:io (treaty-update:cg:ca:cc %ini allied))^~ :: [%alliance ~] :_ this @@ -308,12 +319,14 @@ ++ gone ^- (list card) :~ (fact:io (treaty-update:cg %del ship desk) /treaties ~) + (fact:io (treaty-update:cg %del ship desk) /treaties/[(scot %p ship)] ~) (kick-only:io our.bowl path ~) == ++ give ^- (list card) =/ t=treaty (~(got by treaties) ship desk) :~ (fact:io (treaty-update:cg %add t) /treaties ~) + (fact:io (treaty-update:cg %add t) /treaties/[(scot %p ship)] ~) (fact:io (treaty:cg t) path ~) == -- diff --git a/ui/src/state/docket.ts b/ui/src/state/docket.ts index c5a51d29..90cda359 100644 --- a/ui/src/state/docket.ts +++ b/ui/src/state/docket.ts @@ -223,10 +223,15 @@ export function useAllyTreaties(ship: string) { // [ship] // ) // ); - const { data: treatyData, isLoading } = useReactQueryScry({ + + const { data: treatyData, isLoading } = useReactQuerySubscription< + TreatyUpdateIni, + TreatyUpdate + >({ queryKey: ['treaty', 'treaties', ship], app: 'treaty', path: `/treaties/${ship}`, + scry: `/treaties/${ship}`, options: { enabled: isAllied, }, @@ -238,6 +243,7 @@ export function useAllyTreaties(ship: string) { } return normalizeDockets(treatyData.ini); }, [treatyData]); + const status = getAllyTreatyStatus( treaties, isLoading,