diff --git a/common/src/app/common/schema.cljc b/common/src/app/common/schema.cljc index 701e2c3a2..c741ee682 100644 --- a/common/src/app/common/schema.cljc +++ b/common/src/app/common/schema.cljc @@ -906,8 +906,7 @@ (register! ::inst type:inst) -(register! ::fn - [:schema fn?]) +(register! ::fn [:schema fn?]) ;; FIXME: deprecated, replace with ::text diff --git a/frontend/src/app/main/data/users.cljs b/frontend/src/app/main/data/users.cljs index 6cc9c6607..1a61a0644 100644 --- a/frontend/src/app/main/data/users.cljs +++ b/frontend/src/app/main/data/users.cljs @@ -19,7 +19,6 @@ [app.main.data.websocket :as ws] [app.main.features :as features] [app.main.repo :as rp] - [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr]] [app.util.router :as rt] [app.util.storage :refer [storage]] @@ -136,8 +135,7 @@ (swap! storage assoc :profile profile) (i18n/set-locale! (:lang profile)) (when (not= previous-email email) - (set-current-team! nil)) - (dom/set-html-theme-color (or (:theme profile) "default"))))))) + (set-current-team! nil))))))) (defn fetch-profile [] diff --git a/frontend/src/app/main/ui/auth.cljs b/frontend/src/app/main/ui/auth.cljs index bec7eccd5..b4c2b0a7f 100644 --- a/frontend/src/app/main/ui/auth.cljs +++ b/frontend/src/app/main/ui/auth.cljs @@ -29,16 +29,11 @@ (not= section :auth-register-validate) (not= section :auth-register-success)) params (:query-params route) - error (:error params) - default-light? (cf/external-feature-flag "onboarding-02" "test")] + error (:error params)] (mf/with-effect [] (dom/set-html-title (tr "title.default"))) - (mf/with-effect [default-light?] - (when default-light? - (dom/set-html-theme-color "light"))) - (mf/with-effect [error] (when error (st/emit! (du/show-redirect-error error)))) diff --git a/frontend/src/app/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs index e4edd0299..192a96635 100644 --- a/frontend/src/app/main/ui/auth/register.cljs +++ b/frontend/src/app/main/ui/auth/register.cljs @@ -177,7 +177,6 @@ [{:keys [params on-success-callback]}] (let [form (fm/use-form :schema schema:register-validate-form :initial params) submitted? (mf/use-state false) - theme (when (cf/external-feature-flag "onboarding-02" "test") "light") on-success (mf/use-fn @@ -209,8 +208,7 @@ (mf/deps on-success on-error) (fn [form _] (reset! submitted? true) - (let [params (cond-> (:clean-data @form) - (some? theme) (assoc :theme theme))] + (let [params (:clean-data @form)] (->> (rp/cmd! :register-profile params) (rx/finalize #(reset! submitted? false)) (rx/subs! on-success on-error)))))] diff --git a/frontend/src/app/main/ui/viewer/share_link.cljs b/frontend/src/app/main/ui/viewer/share_link.cljs index bbe63d08e..1f86f0ae2 100644 --- a/frontend/src/app/main/ui/viewer/share_link.cljs +++ b/frontend/src/app/main/ui/viewer/share_link.cljs @@ -126,7 +126,7 @@ (let [params (prepare-params options) params (assoc params :file-id (:id file))] (st/emit! (dc/create-share-link params) - (ptk/event ::ev/event {::ev/name "create-shared-link" + (ptk/event ::ev/event {::ev/name "create-share-link" ::ev/origin "viewer" :can-comment (:who-comment params) :can-inspect-code (:who-inspect params)})))) @@ -137,7 +137,9 @@ (st/emit! (ntf/show {:level :info :type :toast :content (tr "common.share-link.link-copied-success") - :timeout 1000}))) + :timeout 1000}) + (ptk/event ::ev/event {::ev/name "copy-share-link" + ::ev/origin "viewer"}))) try-delete-link (fn [_]