diff --git a/CHANGES.md b/CHANGES.md index 6c020ebb1..c20143fa1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,7 @@ - Increase the height of the right sidebar dropdowns [Taiga #10615](https://tree.taiga.io/project/penpot/issue/10615) - Fix scroll on token themes modal [Taiga #10745](https://tree.taiga.io/project/penpot/issue/10745) - Fix unexpected exception on path editor on merge segments when undo stack is empty +- Fix pricing CTA to be under a config flag [Taiga #10808](https://tree.taiga.io/project/penpot/issue/10808) ## 2.6.1 diff --git a/backend/scripts/repl b/backend/scripts/repl index 6da57ebcc..558a68b95 100755 --- a/backend/scripts/repl +++ b/backend/scripts/repl @@ -30,7 +30,8 @@ export PENPOT_FLAGS="\ enable-access-tokens \ enable-tiered-file-data-storage \ enable-file-validation \ - enable-file-schema-validation"; + enable-file-schema-validation \ + enable-subscriptions-old"; # Default deletion delay for devenv export PENPOT_DELETION_DELAY="24h" diff --git a/backend/scripts/start-dev b/backend/scripts/start-dev index 9fe2ccb1b..dae3af23a 100755 --- a/backend/scripts/start-dev +++ b/backend/scripts/start-dev @@ -23,7 +23,8 @@ export PENPOT_FLAGS="\ enable-access-tokens \ enable-tiered-file-data-storage \ enable-file-validation \ - enable-file-schema-validation"; + enable-file-schema-validation \ + enable-subscriptions-old"; export OPTIONS=" -A:jmx-remote -A:dev \ diff --git a/common/src/app/common/flags.cljc b/common/src/app/common/flags.cljc index cba12a9cd..dbc39e504 100644 --- a/common/src/app/common/flags.cljc +++ b/common/src/app/common/flags.cljc @@ -124,7 +124,8 @@ ;; TODO: deprecate this flag and consolidate the code :export-file-v3 :render-wasm-dpr - :hide-release-modal}) + :hide-release-modal + :subscriptions-old}) (def all-flags (set/union email login varia)) diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs index 1a0d85b74..0a6d07c8b 100644 --- a/frontend/src/app/main/ui/dashboard/sidebar.cljs +++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs @@ -962,13 +962,14 @@ (dom/open-new-window "https://penpot.app/pricing")))] [:* - [:button {:class (stl/css :upgrade-plan-section) - :on-click on-power-up-click} - [:div {:class (stl/css :penpot-free)} - [:span (tr "dashboard.upgrade-plan.penpot-free")] - [:span {:class (stl/css :no-limits)} (tr "dashboard.upgrade-plan.no-limits")]] - [:div {:class (stl/css :power-up)} - (tr "dashboard.upgrade-plan.power-up")]] + (when (contains? cf/flags :subscriptions-old) + [:button {:class (stl/css :upgrade-plan-section) + :on-click on-power-up-click} + [:div {:class (stl/css :penpot-free)} + [:span (tr "dashboard.upgrade-plan.penpot-free")] + [:span {:class (stl/css :no-limits)} (tr "dashboard.upgrade-plan.no-limits")]] + [:div {:class (stl/css :power-up)} + (tr "dashboard.upgrade-plan.power-up")]]) (when (and team profile) [:& comments-section {:profile profile