- <% if meta.present? %>
-
<%= meta %>
- <% end %>
- <%= status_pill %>
- <%= sync_action if sync_action %>
+
+
+ <%= icon "chevron-right", size: "sm", class: "!w-3.5 !h-3.5 text-secondary group-open:rotate-90 transition-transform" %>
+
+
+
<%= entry[:title] %>
+ <%= render "settings/providers/maturity_badge", label: maturity_lbl %>
+
+
+ <% if meta.present? %>
+ <%= meta %>
+ <% end %>
+ <%= status_pill %>
+
+
+
+ <%= sync_action if sync_action %>
+
diff --git a/config/locales/views/settings/api_keys/es.yml b/config/locales/views/settings/api_keys/es.yml
index 42f27fc6b..0e9b0c7a6 100644
--- a/config/locales/views/settings/api_keys/es.yml
+++ b/config/locales/views/settings/api_keys/es.yml
@@ -37,7 +37,7 @@ es:
never_expires: "Nunca expira"
permissions: "Permisos"
usage_instructions_title: "Cómo usar tu clave API"
- usage_instructions: "Incluye tu clave API en el encabezado X-Api-Key al realizar solicitudes a la API de Maybe:"
+ usage_instructions: "Incluye tu clave API en el encabezado X-Api-Key al realizar solicitudes a la API de %{product_name}:"
regenerate_key: "Crear Nueva Clave"
revoke_key: "Revocar Clave"
revoke_confirmation: "¿Estás seguro de que deseas revocar esta clave API? Esta acción no se puede deshacer y deshabilitará inmediatamente todas las aplicaciones que usen esta clave."
diff --git a/config/locales/views/settings/api_keys/nb.yml b/config/locales/views/settings/api_keys/nb.yml
index c120ac038..482917d4f 100644
--- a/config/locales/views/settings/api_keys/nb.yml
+++ b/config/locales/views/settings/api_keys/nb.yml
@@ -36,7 +36,7 @@ nb:
never_expires: "Utløper aldri"
permissions: "Tillatelser"
usage_instructions_title: "Hvordan bruke din API-nøkkel"
- usage_instructions: "Inkluder din API-nøkkel i X-Api-Key-headeren når du gjør forespørsler til Maybe API-et:"
+ usage_instructions: "Inkluder din API-nøkkel i X-Api-Key-headeren når du gjør forespørsler til %{product_name} API-et:"
regenerate_key: "Opprett ny nøkkel"
revoke_key: "Tilbakekall nøkkel"
revoke_confirmation: "Er du sikker på at du vil tilbakekalle denne API-nøkkelen? Denne handlingen kan ikke angres og vil umiddelbart deaktivere alle applikasjoner som bruker denne nøkkelen."
diff --git a/config/locales/views/settings/api_keys/pl.yml b/config/locales/views/settings/api_keys/pl.yml
index bef95529c..e5d95264d 100644
--- a/config/locales/views/settings/api_keys/pl.yml
+++ b/config/locales/views/settings/api_keys/pl.yml
@@ -37,7 +37,7 @@ pl:
never_expires: Nigdy nie wygasa
permissions: Uprawnienia
usage_instructions_title: Jak używać klucza API
- usage_instructions: 'Dołącz klucz API w nagłówku X-Api-Key podczas wysyłania żądań do API Maybe:'
+ usage_instructions: 'Dołącz klucz API w nagłówku X-Api-Key podczas wysyłania żądań do API %{product_name}:'
regenerate_key: Utwórz nowy klucz
revoke_key: Unieważnij klucz
revoke_confirmation: Czy na pewno chcesz unieważnić ten klucz API? Tej akcji nie można cofnąć, a wszystkie aplikacje używające tego klucza zostaną natychmiast wyłączone.
diff --git a/config/locales/views/settings/api_keys/tr.yml b/config/locales/views/settings/api_keys/tr.yml
index 9a8457720..9aee48687 100644
--- a/config/locales/views/settings/api_keys/tr.yml
+++ b/config/locales/views/settings/api_keys/tr.yml
@@ -36,7 +36,7 @@ tr:
never_expires: "Süresiz"
permissions: "Yetkiler"
usage_instructions_title: "API anahtarınızı nasıl kullanırsınız"
- usage_instructions: "Maybe API'ye istek yaparken API anahtarınızı X-Api-Key başlığına ekleyin:"
+ usage_instructions: "%{product_name} API'ye istek yaparken API anahtarınızı X-Api-Key başlığına ekleyin:"
regenerate_key: "Yeni Anahtar Oluştur"
revoke_key: "Anahtarı İptal Et"
revoke_confirmation: "Bu API anahtarını iptal etmek istediğinizden emin misiniz? Bu işlem geri alınamaz ve bu anahtarı kullanan tüm uygulamalar hemen devre dışı kalır."
diff --git a/config/locales/views/settings/api_keys/zh-TW.yml b/config/locales/views/settings/api_keys/zh-TW.yml
index 8ec8327ed..7f54ff28d 100644
--- a/config/locales/views/settings/api_keys/zh-TW.yml
+++ b/config/locales/views/settings/api_keys/zh-TW.yml
@@ -37,7 +37,7 @@ zh-TW:
never_expires: "永不過期"
permissions: "權限範圍"
usage_instructions_title: "如何使用您的 API 金鑰"
- usage_instructions: "在向 Maybe API 發送請求時，請在 X-Api-Key 標頭 (Header) 中包含您的 API 金鑰："
+ usage_instructions: "在向 %{product_name} API 發送請求時，請在 X-Api-Key 標頭 (Header) 中包含您的 API 金鑰："
regenerate_key: "建立新金鑰"
revoke_key: "撤銷金鑰"
revoke_confirmation: "您確定要撤銷此 API 金鑰嗎？此操作無法還原，且會立即停用所有使用此金鑰的應用程式。"
diff --git a/test/controllers/settings/hostings_controller_test.rb b/test/controllers/settings/hostings_controller_test.rb
index 4ebe20f87..e4ecca9bb 100644
--- a/test/controllers/settings/hostings_controller_test.rb
+++ b/test/controllers/settings/hostings_controller_test.rb
@@ -95,6 +95,55 @@ class Settings::HostingsControllerTest < ActionDispatch::IntegrationTest
end
end
+ # Regression: issue #1824. The OpenAI form auto-submits on blur, so entering
+ # the URI base before the model fires a partial submit that fails validation.
+ # The re-rendered form must show the user's submitted URI base — not the
+ # still-blank saved value — so they can finish typing the model.
+ test "preserves submitted openai uri base in form when validation fails" do
+ with_self_hosting do
+ Setting.openai_uri_base = nil
+ Setting.openai_model = ""
+
+ patch settings_hosting_url, params: { setting: { openai_uri_base: "https://api.example.com/v1" } }
+
+ assert_response :unprocessable_entity
+ assert_select "input[name=?]", "setting[openai_uri_base]" do |inputs|
+ assert_equal "https://api.example.com/v1", inputs.first["value"]
+ end
+ end
+ ensure
+ Setting.openai_uri_base = nil
+ Setting.openai_model = nil
+ end
+
+ # PR #1862 review (jjmata): symmetric coverage for the model field. When the
+ # user changes the URI base and clears the model in the same auto-submit, the
+ # cross-field validation fails — the re-rendered model input must reflect the
+ # user's submitted (cleared) value, not silently revert to the saved model.
+ test "preserves submitted openai model in form when validation fails" do
+ with_self_hosting do
+ Setting.openai_uri_base = "https://saved.example.com/v1"
+ Setting.openai_model = "saved-model"
+
+ patch settings_hosting_url, params: { setting: {
+ openai_uri_base: "https://new.example.com/v1",
+ openai_model: ""
+ } }
+
+ assert_response :unprocessable_entity
+ assert_select "input[name=?]", "setting[openai_uri_base]" do |inputs|
+ assert_equal "https://new.example.com/v1", inputs.first["value"]
+ end
+ assert_select "input[name=?]", "setting[openai_model]" do |inputs|
+ assert_not_equal "saved-model", inputs.first["value"].to_s,
+ "model field must reflect the submitted (cleared) value, not the saved model"
+ end
+ end
+ ensure
+ Setting.openai_uri_base = nil
+ Setting.openai_model = nil
+ end
+
test "can update openai model alone when self hosting is enabled" do
with_self_hosting do
patch settings_hosting_url, params: { setting: { openai_model: "gpt-4" } }
diff --git a/test/models/ibkr_account/historical_balances_sync_test.rb b/test/models/ibkr_account/historical_balances_sync_test.rb
index 66b5ee89b..825cc1aaf 100644
--- a/test/models/ibkr_account/historical_balances_sync_test.rb
+++ b/test/models/ibkr_account/historical_balances_sync_test.rb
@@ -213,6 +213,163 @@ class IbkrAccount::HistoricalBalancesSyncTest < ActiveSupport::TestCase
assert_not_nil @account.balances.find_by(date: Date.new(2026, 5, 8), currency: "CHF")
end
+ test "computes net_market_flows from equity delta minus trade flows" do
+ # Day 1: total=3000, cash=500, non_cash=2500
+ # Day 2: total=3200, cash=500, non_cash=2700 (Δnon_cash=200)
+ # Buy trade on Day 2: CHF 150 (same currency as account, no FX)
+ # nmf = 200 - 150 = 50
+ @ibkr_account.update!(
+ raw_equity_summary_payload: [
+ { report_date: "2026-05-07", total: "3000.00" },
+ { report_date: "2026-05-08", total: "3200.00" }
+ ]
+ )
+ seed_balance(date: Date.new(2026, 5, 7), balance: 3000.00, cash_balance: 500.00)
+ seed_balance(date: Date.new(2026, 5, 8), balance: 3200.00, cash_balance: 500.00)
+
+ security = Security.create!(ticker: "TEST", name: "Test Stock")
+ @account.entries.create!(
+ name: "Buy 100 TEST",
+ date: Date.new(2026, 5, 8),
+ amount: 150.00,
+ currency: "CHF",
+ entryable: Trade.new(security: security, qty: 100, price: 1.5, currency: "CHF")
+ )
+
+ IbkrAccount::HistoricalBalancesSync.new(@ibkr_account).sync!
+
+ day1 = @account.balances.find_by!(date: Date.new(2026, 5, 7), currency: "CHF")
+ day2 = @account.balances.find_by!(date: Date.new(2026, 5, 8), currency: "CHF")
+
+ assert_equal BigDecimal("0"), day1.net_market_flows
+ assert_equal BigDecimal("50"), day2.net_market_flows
+
+ # Virtual column must still resolve to IBKR's equity total minus cash
+ assert_equal BigDecimal("2500.00"), day1.end_non_cash_balance
+ assert_equal BigDecimal("2700.00"), day2.end_non_cash_balance
+ end
+
+ test "applies fx_rate_to_base when trade currency differs from account currency" do
+ # Trade in EUR with fx_rate_to_base=1.1 → CHF 165, not CHF 150
+ # Day 1: non_cash=2500, Day 2: non_cash=2700 (Δ=200)
+ # nmf = 200 - 165 = 35
+ @ibkr_account.update!(
+ raw_equity_summary_payload: [
+ { report_date: "2026-05-07", total: "3000.00" },
+ { report_date: "2026-05-08", total: "3200.00" }
+ ]
+ )
+ seed_balance(date: Date.new(2026, 5, 7), balance: 3000.00, cash_balance: 500.00)
+ seed_balance(date: Date.new(2026, 5, 8), balance: 3200.00, cash_balance: 500.00)
+
+ security = Security.create!(ticker: "TEST2", name: "Test Stock EUR")
+ trade = Trade.new(security: security, qty: 100, price: 1.5, currency: "EUR")
+ trade.exchange_rate = 1.1
+ @account.entries.create!(
+ name: "Buy 100 TEST2",
+ date: Date.new(2026, 5, 8),
+ amount: 150.00,
+ currency: "EUR",
+ entryable: trade
+ )
+
+ IbkrAccount::HistoricalBalancesSync.new(@ibkr_account).sync!
+
+ day2 = @account.balances.find_by!(date: Date.new(2026, 5, 8), currency: "CHF")
+ assert_in_delta 35.0, day2.net_market_flows.to_f, 0.01
+ assert_equal BigDecimal("2700.00"), day2.end_non_cash_balance
+ end
+
+ test "excludes balance row from upsert when Money::ConversionError prevents FX conversion" do
+ # EUR trade with no exchange_rate stored → custom_rate=nil → ConversionError raised.
+ # The affected date is excluded from the upsert entirely so net_market_flows is not
+ # silently wrong (the trade's value would otherwise flow into market appreciation).
+ # The seeded day2 balance is intentionally different from IBKR's total (3150 vs 3200)
+ # so we can assert the row was not overwritten by sync.
+ @ibkr_account.update!(
+ raw_equity_summary_payload: [
+ { report_date: "2026-05-07", total: "3000.00" },
+ { report_date: "2026-05-08", total: "3200.00" }
+ ]
+ )
+ seed_balance(date: Date.new(2026, 5, 7), balance: 3000.00, cash_balance: 500.00)
+ seed_balance(date: Date.new(2026, 5, 8), balance: 3150.00, cash_balance: 500.00)
+
+ security = Security.create!(ticker: "NORATE", name: "No Rate EUR Stock")
+ @account.entries.create!(
+ name: "Buy 100 NORATE",
+ date: Date.new(2026, 5, 8),
+ amount: 150.00,
+ currency: "EUR",
+ entryable: Trade.new(security: security, qty: 100, price: 1.5, currency: "EUR")
+ )
+
+ Money.any_instance.stubs(:exchange_to).raises(
+ Money::ConversionError.new(from_currency: "EUR", to_currency: "CHF", date: Date.new(2026, 5, 8))
+ )
+
+ IbkrAccount::HistoricalBalancesSync.new(@ibkr_account).sync!
+
+ # Day 1 is unaffected — still synced normally
+ day1 = @account.balances.find_by!(date: Date.new(2026, 5, 7), currency: "CHF")
+ assert_equal BigDecimal("3000.00"), day1.balance
+
+ # Day 2 was excluded from the upsert — seeded values are preserved, not overwritten
+ day2 = @account.balances.find_by!(date: Date.new(2026, 5, 8), currency: "CHF")
+ assert_equal BigDecimal("3150.00"), day2.balance # seeded, not IBKR's 3200
+ assert_equal BigDecimal("0"), day2.net_market_flows # seeded, not recomputed
+ end
+
+ test "net_market_flows equals full non_cash delta when account has no trades" do
+ @ibkr_account.update!(
+ raw_equity_summary_payload: [
+ { report_date: "2026-05-07", total: "3000.00" },
+ { report_date: "2026-05-08", total: "3300.00" }
+ ]
+ )
+ seed_balance(date: Date.new(2026, 5, 7), balance: 3000.00, cash_balance: 500.00)
+ seed_balance(date: Date.new(2026, 5, 8), balance: 3300.00, cash_balance: 500.00)
+
+ IbkrAccount::HistoricalBalancesSync.new(@ibkr_account).sync!
+
+ day1 = @account.balances.find_by!(date: Date.new(2026, 5, 7), currency: "CHF")
+ day2 = @account.balances.find_by!(date: Date.new(2026, 5, 8), currency: "CHF")
+
+ assert_equal BigDecimal("0"), day1.net_market_flows
+ assert_equal BigDecimal("300"), day2.net_market_flows
+ assert_equal BigDecimal("2800.00"), day2.end_non_cash_balance
+ end
+
+ test "sell trades reduce net_buy_sell so market loss is isolated in net_market_flows" do
+ # Day 1: total=3000, cash=500, non_cash=2500
+ # Day 2: total=2700, cash=700, non_cash=2000 (Δnon_cash=-500)
+ # Sell 100 at CHF 1.50: entry.amount=-150 (negative = proceeds received)
+ # net_buy_sell=-150; nmf = -500 - (-150) = -350 (market caused -350 loss)
+ @ibkr_account.update!(
+ raw_equity_summary_payload: [
+ { report_date: "2026-05-07", total: "3000.00" },
+ { report_date: "2026-05-08", total: "2700.00" }
+ ]
+ )
+ seed_balance(date: Date.new(2026, 5, 7), balance: 3000.00, cash_balance: 500.00)
+ seed_balance(date: Date.new(2026, 5, 8), balance: 2700.00, cash_balance: 700.00)
+
+ security = Security.create!(ticker: "SELL_TEST", name: "Sell Test Stock")
+ @account.entries.create!(
+ name: "Sell 100 SELL_TEST",
+ date: Date.new(2026, 5, 8),
+ amount: -150.00,
+ currency: "CHF",
+ entryable: Trade.new(security: security, qty: -100, price: 1.5, currency: "CHF")
+ )
+
+ IbkrAccount::HistoricalBalancesSync.new(@ibkr_account).sync!
+
+ day2 = @account.balances.find_by!(date: Date.new(2026, 5, 8), currency: "CHF")
+ assert_equal BigDecimal("-350"), day2.net_market_flows
+ assert_equal BigDecimal("2000.00"), day2.end_non_cash_balance
+ end
+
test "writes balance row with zero total for fully liquidated dates" do
@ibkr_account.update!(
raw_equity_summary_payload: [