Make transaction enrichment opt-in for all users (#1552)

app/controllers/settings/hostings_controller.rb

@@ -26,10 +26,6 @@ class Settings::HostingsController < SettingsController
       Setting.synth_api_key = hosting_params[:synth_api_key]
     end
 
-    if hosting_params.key?(:data_enrichment_enabled)
-      Setting.data_enrichment_enabled = hosting_params[:data_enrichment_enabled]
-    end
-
     redirect_to settings_hosting_path, notice: t(".success")
   rescue ActiveRecord::RecordInvalid => error
     flash.now[:alert] = t(".failure")
@@ -38,7 +34,7 @@ class Settings::HostingsController < SettingsController
 
   private
     def hosting_params
-      params.require(:setting).permit(:render_deploy_hook, :upgrades_setting, :require_invite_for_signup, :synth_api_key, :data_enrichment_enabled)
+      params.require(:setting).permit(:render_deploy_hook, :upgrades_setting, :require_invite_for_signup, :synth_api_key)
     end
 
     def raise_if_not_self_hosted

app/controllers/users_controller.rb

@@ -41,7 +41,7 @@ class UsersController < ApplicationController
     def user_params
       params.require(:user).permit(
         :first_name, :last_name, :profile_image, :redirect_to, :delete_profile_image, :onboarded_at,
-        family_attributes: [ :name, :currency, :country, :locale, :date_format, :timezone, :id ]
+        family_attributes: [ :name, :currency, :country, :locale, :date_format, :timezone, :id, :data_enrichment_enabled ]
       )
     end
 

app/models/account/syncer.rb

@@ -11,7 +11,7 @@ class Account::Syncer
     update_account_info(balances, holdings) unless account.plaid_account_id.present?
     convert_records_to_family_currency(balances, holdings) unless account.currency == account.family.currency
 
-    if Setting.data_enrichment_enabled || Rails.configuration.app_mode.managed?
+    if account.family.data_enrichment_enabled?
       account.enrich_data_later
     else
       Rails.logger.info("Data enrichment is disabled, skipping enrichment for account #{account.id}")

app/models/setting.rb

@@ -17,10 +17,6 @@ class Setting < RailsSettings::Base
         default: ENV.fetch("UPGRADES_TARGET", "release"),
         validates: { inclusion: { in: %w[release commit] } }
 
-  field :data_enrichment_enabled,
-        type: :boolean,
-        default: false
-
   field :synth_api_key, type: :string, default: ENV["SYNTH_API_KEY"]
 
   field :require_invite_for_signup, type: :boolean, default: false

app/views/settings/hostings/_data_enrichment_settings.html.erb

@@ -1,18 +0,0 @@
-<div class="space-y-4">
-  <div class="flex items-center justify-between">
-    <div class="space-y-1">
-      <p class="text-sm"><%= t(".title") %></p>
-      <p class="text-gray-500 text-sm"><%= t(".description") %></p>
-    </div>
-
-    <%= styled_form_with model: Setting.new,
-                       url: settings_hosting_path,
-                       method: :patch,
-                       data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value": "blur" } do |form| %>
-      <div class="relative inline-block select-none">
-        <%= form.check_box :data_enrichment_enabled, class: "sr-only peer", "data-auto-submit-form-target": "auto", "data-autosubmit-trigger-event": "input" %>
-        <%= form.label :data_enrichment_enabled, "&nbsp;".html_safe, class: "maybe-switch" %>
-      </div>
-    <% end %>
-  </div>
-</div>

app/views/settings/hostings/show.html.erb

@@ -10,7 +10,6 @@
       <%= render "settings/hostings/upgrade_settings" %>
       <%= render "settings/hostings/provider_settings" %>
       <%= render "settings/hostings/synth_settings" %>
-      <%= render "settings/hostings/data_enrichment_settings" %>
     </div>
   <% end %>
 

app/views/settings/preferences/_data_enrichment_settings.html.erb

@@ -0,0 +1,24 @@
+<%# locals: (user:) %>
+
+<div class="space-y-4">
+  <div class="flex items-center justify-between">
+    <div class="space-y-1">
+      <p class="text-sm"><%= t(".title") %></p>
+      <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+      <% if self_hosted? %>
+        <p class="text-xs italic text-gray-500"><%= t(".self_host_disclaimer") %></p>
+      <% end %>
+    </div>
+
+    <%= styled_form_with model: user,
+                         data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value": "blur" } do |form| %>
+      <div class="relative inline-block select-none">
+        <%= form.hidden_field :redirect_to, value: "preferences" %>
+        <%= form.fields_for :family do |family_form| %>
+          <%= family_form.check_box :data_enrichment_enabled, class: "sr-only peer", "data-auto-submit-form-target": "auto", "data-autosubmit-trigger-event": "input" %>
+          <%= family_form.label :data_enrichment_enabled, "&nbsp;".html_safe, class: "maybe-switch" %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>

app/views/settings/preferences/show.html.erb

@@ -40,6 +40,11 @@
       <% end %>
     </div>
   <% end %>
+
+  <%= settings_section title: t(".data"), subtitle: t(".data_subtitle") do %>
+    <%= render "settings/preferences/data_enrichment_settings", user: @user %>
+  <% end %>
+
   <%= settings_section title: t(".theme_title"), subtitle: t(".theme_subtitle") do %>
     <div>
       <%= styled_form_with model: @user, class: "flex justify-between items-center" do |form| %>