The personal finance app for everyone
Handle nil name for entries (#1550)
Zach Gollwitzer45add7512b00
diff --git a/.erb-lint.yml b/.erb_lint.ymlsimilarity index 100%rename from .erb-lint.ymlrename to .erb_lint.ymldiff --git a/app/models/account/data_enricher.rb b/app/models/account/data_enricher.rbindex 4beb0b92..e0615cc1 100644--- a/app/models/account/data_enricher.rb+++ b/app/models/account/data_enricher.rb@@ -23,6 +23,8 @@ class Account::DataEnrichercandidates.each do |entry|if entry.enriched_at.nil? || entry.entryable.merchant_id.nil? || entry.entryable.category_id.nil?begin+ next unless entry.name.present?+info = self.class.synth_provider.enrich_transaction(entry.name).infonext unless info.present?@@ -48,7 +50,7 @@ class Account::DataEnrichercategory.save! if category.present?entry.update!(enriched_at: Time.current,- name: entry.enriched_at.nil? ? info.name : entry.name,+ name: entry.enriched_at.nil? && info.name ? info.name : entry.name,entryable_attributes: entryable_attributes)enddiff --git a/app/models/account/transaction.rb b/app/models/account/transaction.rbindex 91f24f70..fbf2aa9e 100644--- a/app/models/account/transaction.rb+++ b/app/models/account/transaction.rb@@ -49,7 +49,7 @@ class Account::Transaction < ApplicationRecordenddef name- entry.name || "(no description)"+ entry.name || (entry.amount.positive? ? "Expense" : "Income")enddef eod_balancediff --git a/app/models/account/valuation.rb b/app/models/account/valuation.rbindex 93ebf5ff..5a4d1b8f 100644--- a/app/models/account/valuation.rb+++ b/app/models/account/valuation.rb@@ -10,4 +10,8 @@ class Account::Valuation < ApplicationRecordfalseendend++ def name+ "Balance update"+ endenddiff --git a/app/views/account/transactions/_transaction.html.erb b/app/views/account/transactions/_transaction.html.erbindex 9a37a958..d63ddf8b 100644--- a/app/views/account/transactions/_transaction.html.erb+++ b/app/views/account/transactions/_transaction.html.erb@@ -14,14 +14,14 @@<% if entry.account_transaction.merchant&.icon_url %><%= image_tag entry.account_transaction.merchant.icon_url, class: "w-6 h-6 rounded-full" %><% else %>- <%= render "shared/circle_logo", name: entry.name, size: "sm" %>+ <%= render "shared/circle_logo", name: transaction.name, size: "sm" %><% end %><div class="truncate"><% if entry.new_record? %>- <%= content_tag :p, entry.name %>+ <%= content_tag :p, transaction.name %><% else %>- <%= link_to entry.name,+ <%= link_to transaction.name,entry.transfer.present? ? account_transfer_path(entry.transfer) : account_entry_path(entry),data: { turbo_frame: "drawer", turbo_prefetch: false },class: "hover:underline hover:text-gray-800" %>diff --git a/app/views/account/valuations/_valuation.html.erb b/app/views/account/valuations/_valuation.html.erbindex fc4c05d0..0761fd17 100644--- a/app/views/account/valuations/_valuation.html.erb+++ b/app/views/account/valuations/_valuation.html.erb@@ -18,9 +18,9 @@<div class="truncate text-gray-900"><% if entry.new_record? %>- <%= content_tag :p, entry.name %>+ <%= content_tag :p, entry.entryable.name %><% else %>- <%= link_to entry.name || t(".balance_update"),+ <%= link_to entry.entryable.name,account_entry_path(entry),data: { turbo_frame: "drawer", turbo_prefetch: false },class: "hover:underline hover:text-gray-800" %>diff --git a/app/views/shared/_circle_logo.html.erb b/app/views/shared/_circle_logo.html.erbindex 17f1948a..e8dd7c1f 100644--- a/app/views/shared/_circle_logo.html.erb+++ b/app/views/shared/_circle_logo.html.erb@@ -9,5 +9,5 @@<%= tag.div style: mixed_hex_styles(hex),class: [size_classes[size], "flex shrink-0 items-center justify-center rounded-full"] do %>- <%= tag.span name[0].upcase, class: ["font-medium", size == "sm" ? "text-xs" : "text-sm"] %>+ <%= tag.span (name.presence&.first || "T").upcase, class: ["font-medium", size == "sm" ? "text-xs" : "text-sm"] %><% end %>diff --git a/bin/erblint b/bin/erblintdeleted file mode 100755index 63d662cf..00000000--- a/bin/erblint+++ /dev/null@@ -1,27 +0,0 @@-#!/usr/bin/env ruby-# frozen_string_literal: true--#-# This file was generated by Bundler.-#-# The application 'erblint' is installed as part of a gem, and-# this file is here to facilitate running it.-#--ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)--bundle_binstub = File.expand_path("bundle", __dir__)--if File.file?(bundle_binstub)- if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")- load(bundle_binstub)- else- abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")- end-end--require "rubygems"-require "bundler/setup"--load Gem.bin_path("erb_lint", "erblint")diff --git a/config/locales/views/account/valuations/en.yml b/config/locales/views/account/valuations/en.ymlindex ba8637c6..c157b6d6 100644--- a/config/locales/views/account/valuations/en.yml+++ b/config/locales/views/account/valuations/en.yml@@ -2,8 +2,6 @@en:account:valuations:- valuation:- balance_update: Balance updateform:amount: Amountsubmit: Add balance updatediff --git a/config/locales/views/settings/hostings/en.yml b/config/locales/views/settings/hostings/en.ymlindex dcd65f06..b3f04fc9 100644--- a/config/locales/views/settings/hostings/en.yml+++ b/config/locales/views/settings/hostings/en.yml@@ -3,7 +3,8 @@ en:settings:hostings:data_enrichment_settings:- description: Enable data enrichment for your account transactions. This will incur additional Synth credits.+ description: Enable data enrichment for your account transactions. This will+ incur additional Synth credits.title: Data Enrichmentinvite_code_settings:description: Every new user that joins your instance of Maybe can only do