diff --git a/src/cljs/auto_ap/views/pages/admin/rules/form.cljs b/src/cljs/auto_ap/views/pages/admin/rules/form.cljs index fe5738e4..8688c102 100644 --- a/src/cljs/auto_ap/views/pages/admin/rules/form.cljs +++ b/src/cljs/auto_ap/views/pages/admin/rules/form.cljs @@ -100,6 +100,7 @@ :dom-lte nil :dom-gte nil :vendor nil + :transaction-approval-status :unapproved :accounts []))))) (re-frame/reg-event-db diff --git a/src/cljs/auto_ap/views/pages/transactions/form.cljs b/src/cljs/auto_ap/views/pages/transactions/form.cljs index fa0663ab..a6672276 100644 --- a/src/cljs/auto_ap/views/pages/transactions/form.cljs +++ b/src/cljs/auto_ap/views/pages/transactions/form.cljs @@ -141,11 +141,15 @@ {:keys [form field raw-field error-notification submit-button ]} transaction-form] [form {:title "Hello" :edit-completed edit-completed} - (when @(re-frame/subscribe [::subs/is-admin?]) - [field "Merchant" + (when (and @(re-frame/subscribe [::subs/is-admin?]) + (get-in data [:yodlee-merchant])) + [:div.control + [:p.help "Merchant"] [:input.input {:type "text" - :field [:yodlee-merchant :name] - :disabled "disabled"}]]) + :disabled true + :value (str (get-in data [:yodlee-merchant :name]) + " - " + (get-in data [:yodlee-merchant :yodlee-id]))}]]) (when @(re-frame/subscribe [::subs/is-admin?]) [field "Matched Rule"