final final fixes for 1.4.0 (clear conflicting watch paths, show pled…

…ge message if contrib empty)
tocwex · Sep 20, 2024 · 0aac72b · 0aac72b
1 parent d424c45
commit 0aac72b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 26 deletions.
diff --git a/desk/bare/app/fund.hoon b/desk/bare/app/fund.hoon
@@ -636,8 +636,11 @@
     %-  zing  %+  turn
       (skim ~(tap in scan-vany:watch:audit) |=(p=path =((scag pen pat) (scag pen p))))
     |=  old=path
-    :-  car(pat old, act [%leave ~])
-    ?:  =(pat old)  ~
+    :-  car(pat old, act [%leave ~])                    ::  clear out:
+    ?.  ?|  (~(has in scan-vold:watch:audit) old)       ::  - all old watch paths
+            &(!=(old pat) =(~ tob) =(%$ (rear old)))    ::  - all new indefinite paths
+        ==
+      ~
     [car(pat old, act [%poke %fund-watcher-poke !>([%clear old])])]~
   ::
   ++  pj-do-read

diff --git a/desk/bare/web/fund/page/proj-view.hoon b/desk/bare/web/fund/page/proj-view.hoon
@@ -658,18 +658,21 @@
                         ==
                   ==
                 ==
-                ;div(class "flex flex-col gap-2", x-data "\{expanded: {(bool:enjs:ff:fh mow)}}")
-                  ;div(x-show "expanded")
-                    ;+  ?:  |(=('' note.mul) ?=(%pruf -.mul))
-                          ;p(class "fund-warn"): No message included.
-                        ::  TODO: Consider including the pledge message here too
-                        ;p(class "leading-normal tracking-wide"): {(trip note.mul)}
-                  ==
-                  ;button.fund-butn-ac-s.mx-auto  =type  "button"
-                      =x-show  "!{(bool:enjs:ff:fh mow)}"
-                      =x-on-click  "expanded = ! expanded"
-                    ; toggle ~
-                  ==
+                ;div(class "flex flex-col gap-2")
+                  ;+  =/  msg=@t
+                        ?-  -.mul
+                          %pruf  %$
+                          %plej  note.mul
+                        ::
+                            %trib
+                          =+  teb=-:(~(got by contribs.pro) q.xact.when.mul)
+                          ?.(=(%$ note.teb) note.teb ?~(plej.teb %$ note.u.plej.teb))
+                        ==
+                      ?.  mow
+                        ;p(class "fund-warn"): Message hidden by administrator.
+                      ?:  =(%$ msg)
+                        ;p(class "fund-warn"): No message included.
+                      ;p(class "leading-normal tracking-wide"): {(trip msg)}
                 ==
                 ;*  =-  ?~  buz  ~
                         :_  ~
@@ -678,11 +681,12 @@
                         ==
                     ^-  buz=marl
                     ;:    welp
-                    ::  mula blot button  ::
-                        ?.  &(pyr !?=(%pruf -.mul))  ~
+                    ::  chain data claim button  ::
+                        ?.  &((auth:fh bol) ?=(%pruf -.mul) ?=(%depo note.mul))  ~
                       :_  ~
-                      ;form(method "post")
-                        ;+  (prod-butn:ui:fh %mula-blot %action "toggle shown ~" "editMula" ~)
+                      ;form  =method  "post"
+                          =x-show  "($store.wallet.address ?? '').toLowerCase() == mula_from"
+                        ;+  (prod-butn:ui:fh %mula-mine %action "claim transaction ~" "editMula" ~)
                       ==
                     ::  pledge edit view button  ::
                         ?.  ?&  pyr
@@ -693,14 +697,7 @@
                         ~
                       :_  ~
                       ;form(method "post")
-                        ;+  (prod-butn:ui:fh %mula-view %action "toggle view ~" "editMula" ~)
-                      ==
-                    ::  chain data claim button  ::
-                        ?.  &(?=(%pruf -.mul) ?=(%depo note.mul))  ~
-                      :_  ~
-                      ;form  =method  "post"
-                          =x-show  "($store.wallet.address ?? '').toLowerCase() == mula_from"
-                        ;+  (prod-butn:ui:fh %mula-mine %action "claim data ~" "editMula" ~)
+                        ;+  (prod-butn:ui:fh %mula-view %action "toggle status ~" "editMula" ~)
                       ==
                     ::  attested redo button  ::
                         ?.  ?&  pyr
@@ -713,6 +710,12 @@
                       ;form(method "post")
                         ;+  (prod-butn:ui:fh %mula-redo %action "query chain ~" "editMula" ~)
                       ==
+                    ::  mula blot button  ::
+                        ?.  &(pyr !?=(%pruf -.mul))  ~
+                      :_  ~
+                      ;form(method "post")
+                        ;+  (prod-butn:ui:fh %mula-blot %action "toggle shown ~" "editMula" ~)
+                      ==
                     ==
               ==
         ==