Skip to content

Commit

Permalink
Update from main
Browse files Browse the repository at this point in the history
  • Loading branch information
Shpigford committed Feb 5, 2025
1 parent 9827b45 commit 4e54062
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 7 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ gem "redcarpet"
gem "stripe"
gem "intercom-rails"
gem "holidays"
gem "redcarpet"
gem "plaid"

group :development, :test do
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ GEM
hashdiff (1.1.2)
highline (3.1.2)
reline
holidays (8.8.0)
hotwire-livereload (2.0.0)
actioncable (>= 7.0.0)
listen (>= 3.0.0)
Expand Down Expand Up @@ -544,6 +545,7 @@ DEPENDENCIES
faraday-multipart
faraday-retry
good_job
holidays
hotwire-livereload
hotwire_combobox!
i18n-tasks
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ bin/dev

# Optionally, load demo data
rake demo_data:reset

# Optionally, setup AI user
rake ai:setup
```

And visit http://localhost:3000 to see the app. You can use the following
Expand Down
19 changes: 17 additions & 2 deletions app/assets/stylesheets/application.tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,9 @@

.scrollbar::-webkit-scrollbar-thumb:hover {
background: #a6a6a6;
}
}
}


.loading-ellipsis {
display: inline-flex;
}
Expand Down Expand Up @@ -205,4 +204,20 @@
50% {
transform: scale(1.3);
}
}

/* Custom scrollbar implementation for Windows browsers */
.windows {
::-webkit-scrollbar {
width: 4px;
}

::-webkit-scrollbar-thumb {
background: #d6d6d6;
border-radius: 10px;
}

::-webkit-scrollbar-thumb:hover {
background: #a6a6a6;
}
}
5 changes: 5 additions & 0 deletions app/models/account/syncer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def run
account.reload
update_account_info(balances, holdings) unless account.plaid_account_id.present?
convert_records_to_family_currency(balances, holdings) unless account.currency == account.family.currency
calculate_metrics

# Enrich if user opted in or if we're syncing transactions from a Plaid account on the hosted app
if account.family.data_enrichment_enabled? || (account.plaid_account_id.present? && Rails.application.config.app_mode.hosted?)
Expand Down Expand Up @@ -70,6 +71,10 @@ def sync_balances(holdings)
calculated_balances
end

def calculate_metrics
Account::MetricsCalculator.new(account).calculate
end

def convert_records_to_family_currency(balances, holdings)
from_currency = account.currency
to_currency = account.family.currency
Expand Down
5 changes: 1 addition & 4 deletions db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4e54062

Please sign in to comment.