Clean up direct message (no recipient)

district0x · May 14, 2024 · 4b72b98 · 4b72b98
1 parent 54ebe25
commit 4b72b98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/ui/src/ethlance/ui/page/job_contract.cljs b/ui/src/ethlance/ui/page/job_contract.cljs
@@ -318,10 +318,8 @@
 
 
 (defn c-direct-message
-  [recipients]
-  (let [non-nil-recipients (into {} (filter second recipients))
-        text (re/subscribe [:page.job-contract/message-text])
-        recipient (re/subscribe [:page.job-contract/message-recipient])
+  []
+  (let [text (re/subscribe [:page.job-contract/message-text])
         job-story-id (re/subscribe [:page.job-contract/job-story-id])]
     [:div.message-input-container
      [:div.label "Message"]
@@ -330,7 +328,6 @@
                         :on-change #(re/dispatch [:page.job-contract/set-message-text %])}]
      [c-button {:color :primary
                 :on-click #(re/dispatch [:page.job-contract/send-message {:text @text
-                                                                          :to @recipient
                                                                           :job-story/id @job-story-id}])}
       [c-button-label "Send Message"]]]))
 
@@ -379,7 +376,7 @@
     :default-tab 1}
 
    {:label "Send Message"}
-   [c-direct-message (select-keys message-params [:candidate :arbiter])]
+   [c-direct-message]
 
    {:label "Accept Proposal"}
    [c-accept-proposal-message message-params]
@@ -472,7 +469,7 @@
 
 
      {:label "Send Message"}
-     [c-direct-message (select-keys message-params [:employer :arbiter])]
+     [c-direct-message]
 
      {:label "Raise Dispute"}
      (if can-dispute?
@@ -568,7 +565,7 @@
       :default-tab 0}
 
      {:label "Send Message"}
-     [c-direct-message (select-keys message-params [:candidate :employer])]
+     [c-direct-message]
 
      {:label "Resolve Dispute" :active? true} ; TODO: conditionally show
      (if dispute-to-resolve?

diff --git a/ui/src/ethlance/ui/page/job_contract/events.cljs b/ui/src/ethlance/ui/page/job_contract/events.cljs
@@ -40,7 +40,6 @@
 
 (re/reg-event-fx :page.job-contract/initialize-page initialize-page)
 (re/reg-event-fx :page.job-contract/set-message-text (create-assoc-handler :message-text))
-(re/reg-event-fx :page.job-contract/set-message-recipient (create-assoc-handler :message-recipient))
 
 
 (re/reg-event-fx :page.job-contract/set-accept-proposal-message-text
@@ -56,7 +55,6 @@
 
 (re/reg-event-fx :page.job-contract/set-feedback-rating (create-assoc-handler :feedback-rating))
 (re/reg-event-fx :page.job-contract/set-feedback-text (create-assoc-handler :feedback-text))
-(re/reg-event-fx :page.job-contract/set-feedback-recipient (create-assoc-handler :feedback-recipient))
 
 (re/reg-event-db :page.job-contract/dispute-to-ipfs-failure (create-logging-handler))
 (re/reg-event-fx :page.job-contract/tx-hash (create-logging-handler))
@@ -97,7 +95,6 @@
   [{:keys [db]} [_event-name params]]
   (let [job-story-id (:job-story/id params)
         text (:text params)
-        to (:to params)
         mutation-params {:job-story/id job-story-id :text text}]
     {:db (clear-forms db)
      :fx [[:dispatch [::gql-events/mutation

diff --git a/ui/src/ethlance/ui/page/job_contract/subscriptions.cljs b/ui/src/ethlance/ui/page/job_contract/subscriptions.cljs
@@ -17,7 +17,6 @@
 
 
 (re/reg-sub :page.job-contract/message-text (create-get-handler :message-text))
-(re/reg-sub :page.job-contract/message-recipient (create-get-handler :message-recipient))
 
 (re/reg-sub :page.job-contract/accept-proposal-message-text (create-get-handler :accept-proposal-message-text))
 (re/reg-sub :page.job-contract/accept-invitation-message-text (create-get-handler :accept-invitation-message-text))