Show onboarding unless invitation present

Fixes #1421
maybe-finance · Nov 6, 2024 · 455257b · 455257b
1 parent f2739b7
commit 455257b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/controllers/onboardings_controller.rb b/app/controllers/onboardings_controller.rb
@@ -19,6 +19,6 @@ def set_user
     end
 
     def load_invitation
-      @invitation = Invitation.accepted.most_recent_for_email(Current.user.email)
+      @invitation = Current.family.invitations.accepted.find_by(email: Current.user.email)
     end
 end
diff --git a/app/models/invitation.rb b/app/models/invitation.rb
@@ -12,7 +12,6 @@ class Invitation < ApplicationRecord
 
   scope :pending, -> { where(accepted_at: nil).where("expires_at > ?", Time.current) }
   scope :accepted, -> { where.not(accepted_at: nil) }
-  scope :most_recent_for_email, ->(email) { where(email: email).order(accepted_at: :desc).first }
 
   def pending?
     accepted_at.nil? && expires_at > Time.current

diff --git a/test/system/transactions_test.rb b/test/system/transactions_test.rb
@@ -183,8 +183,10 @@ class TransactionsTest < ApplicationSystemTestCase
     investment_account.entries.create!(name: "Investment account", date: Date.current, amount: 1000, currency: "USD", entryable: Account::Transaction.new)
     transfer_date = Date.current
     visit account_url(investment_account)
-    click_on "New"
-    click_on "New transaction"
+    within "[data-testid='activity-menu']" do
+      click_on "New"
+      click_on "New transaction"
+    end
     select "Deposit", from: "Type"
     fill_in "Date", with: transfer_date
     fill_in "account_entry[amount]", with: 175.25