diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 37d5595022..7f9496dfe9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,12 +2,11 @@ name: Tests
on:
push:
-
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref }}
- cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+ workflow_dispatch:
env:
+ CLERK_SECRET_KEY: ${{ secrets.CLERK_SECRET_KEY }}
+ NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: ${{ secrets.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY }}
NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ${{ secrets.NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY }}
RAILS_ENV: test
STRIPE_SECRET_KEY: ${{ secrets.STRIPE_SECRET_KEY }}
@@ -16,7 +15,7 @@ env:
jobs:
rspec:
- runs-on: ubicloud-standard-2
+ runs-on: ubuntu-24.04
services:
postgres:
@@ -31,28 +30,22 @@ jobs:
--health-interval 10s
--health-timeout 5s
--health-retries 5
-
redis:
image: redis:7.4.2
ports:
- 6389:6379
options: --entrypoint redis-server
-
strategy:
fail-fast: false
matrix:
ci_node_total: [2]
ci_node_index: [0, 1]
-
steps:
- uses: actions/checkout@v4
-
- name: Build setup
uses: ./.github/common/
-
- name: Setup test database
run: cd backend && bundle exec rails db:create db:schema:load
-
- name: Run tests
env:
RUBY_YJIT_ENABLE: 1
@@ -65,18 +58,14 @@ jobs:
playwright:
name: playwright
- runs-on: ubicloud-standard-4
+ runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
-
- name: Build setup
uses: ./.github/common/
-
- run: pnpm puppeteer browsers install chrome
-
- run: node docker/createCertificate.js
-
- name: Cache Next build
id: next-cache
uses: actions/cache@v4
@@ -85,13 +74,10 @@ jobs:
key: next-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml', 'backend/pnpm-lock.yaml', 'frontend/pnpm-lock.yaml') }}-${{ hashFiles('frontend/**/*.{ts,tsx}') }}
restore-keys: |
next-${{ runner.os }}-
-
- run: NODE_ENV=test pnpm run build-next --no-lint
shell: bash
-
- name: Install foreman
run: gem install foreman
-
- name: Cache Playwright browsers
id: playwright-cache
uses: actions/cache@v4
@@ -100,20 +86,16 @@ jobs:
key: playwright-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml', 'backend/pnpm-lock.yaml', 'frontend/pnpm-lock.yaml') }}
restore-keys: |
playwright-${{ runner.os }}-
-
- name: Install Playwright Browsers
run: pnpm playwright install --with-deps chromium
if: steps.playwright-cache.outputs.cache-hit != 'true'
-
- name: Run docker compose
run: docker compose -f docker/docker-compose-local-linux.yml up -d
-
- name: Run Playwright tests
run: pnpm playwright test
-
- uses: actions/upload-artifact@v4
if: ${{ !cancelled() }}
with:
name: playwright-report
path: playwright-report/
- retention-days: 7
+ retention-days: 7
\ No newline at end of file
diff --git a/backend/app/controllers/concerns/set_current.rb b/backend/app/controllers/concerns/set_current.rb
index 4a592ba64e..21fd0b398e 100644
--- a/backend/app/controllers/concerns/set_current.rb
+++ b/backend/app/controllers/concerns/set_current.rb
@@ -26,7 +26,7 @@ def set_current
if user && cookies["invitation_token"].present?
invite_link = CompanyInviteLink.find_by(token: cookies["invitation_token"])
invited_company = invite_link&.company
- user.update!(signup_invite_link: invite_link) if invite_link
+ AcceptCompanyInviteLink.new(user:, token: invite_link.token).perform if invite_link
cookies.delete("invitation_token")
end
diff --git a/backend/app/mailers/company_worker_mailer.rb b/backend/app/mailers/company_worker_mailer.rb
index 2d1cb607d6..ca18094f78 100644
--- a/backend/app/mailers/company_worker_mailer.rb
+++ b/backend/app/mailers/company_worker_mailer.rb
@@ -77,6 +77,17 @@ def payment_failed_reenter_bank_details(payment_id, amount, currency)
mail(to: user.email, reply_to: company.email, subject: "🔴 Payment failed: re-enter your bank details")
end
+ def payment_failed(payment_id, amount, currency)
+ @payment = Payment.find(payment_id)
+ @invoice = @payment.invoice
+ @currency = currency
+ @amount = amount
+ company = @invoice.company
+ user = @invoice.user
+
+ mail(to: user.email, reply_to: company.email, subject: "🔴 Payment failed: payment failure for invoice ##{@invoice.id}")
+ end
+
def equity_percent_selection(company_worker_id)
company_worker = CompanyWorker.find(company_worker_id)
@company = company_worker.company
diff --git a/backend/app/services/pay_investor_dividends.rb b/backend/app/services/pay_investor_dividends.rb
index 7db37dba20..a6383fa168 100644
--- a/backend/app/services/pay_investor_dividends.rb
+++ b/backend/app/services/pay_investor_dividends.rb
@@ -20,7 +20,6 @@ def process
user.tax_information_confirmed_at.nil? ||
user.bank_account_for_dividends.nil?
return unless user.has_verified_tax_id?
- raise "Feature unsupported for company #{company.id}" unless company.equity_enabled?
raise "Flexile balance insufficient to pay for dividends to investor #{company_investor.id}" unless Wise::AccountBalance.has_sufficient_flexile_balance?(net_amount_in_usd)
raise "Unknown country for user #{user.id}" if user.country_code.blank?
diff --git a/backend/app/services/pay_investor_equity_buybacks.rb b/backend/app/services/pay_investor_equity_buybacks.rb
index 80d6e98018..3954648b73 100644
--- a/backend/app/services/pay_investor_equity_buybacks.rb
+++ b/backend/app/services/pay_investor_equity_buybacks.rb
@@ -20,7 +20,6 @@ def process
user.tax_information_confirmed_at.nil?
return unless user.has_verified_tax_id?
- raise "Feature unsupported for company #{company.id}" unless company.equity_enabled?
raise "Flexile balance insufficient to pay for equity buybacks to investor #{company_investor.id}" unless Wise::AccountBalance.has_sufficient_flexile_balance?(net_amount_in_usd)
raise "Unknown country for user #{user.id}" if user.country_code.blank?
diff --git a/backend/app/services/pay_invoice.rb b/backend/app/services/pay_invoice.rb
index b320730465..ca56e4ee70 100644
--- a/backend/app/services/pay_invoice.rb
+++ b/backend/app/services/pay_invoice.rb
@@ -40,7 +40,6 @@ def process
account = payout_service.get_recipient_account(recipient_id: bank_account.recipient_id)
unless account["active"]
bank_account.mark_deleted!
- CompanyWorkerMailer.payment_failed_reenter_bank_details(payment.id, amount, target_currency).deliver_later
raise WiseError, "Bank account is no longer active for payment #{payment.id}"
end
quote = payout_service.create_quote(target_currency:, amount:, recipient_id: bank_account.recipient_id)
@@ -68,6 +67,16 @@ def process
rescue WiseError => e
payment.update!(status: Payment::FAILED)
invoice.update!(status: Invoice::FAILED)
+
+ target_currency = payment.wise_recipient&.currency || "USD"
+ amount = payment.cash_amount_in_usd
+
+ if e.message.include?("Bank account is no longer active")
+ CompanyWorkerMailer.payment_failed_reenter_bank_details(payment.id, amount, target_currency).deliver_later
+ else
+ CompanyWorkerMailer.payment_failed(payment.id, amount, target_currency).deliver_later
+ end
+
raise e
end
end
diff --git a/backend/app/sidekiq/wise_transfer_update_job.rb b/backend/app/sidekiq/wise_transfer_update_job.rb
index dad9774ad8..ea6e0091ee 100644
--- a/backend/app/sidekiq/wise_transfer_update_job.rb
+++ b/backend/app/sidekiq/wise_transfer_update_job.rb
@@ -36,6 +36,11 @@ def perform(params)
if payment.is_a?(Payment)
amount_cents = api_service.get_transfer(transfer_id:)["sourceValue"] * -100
payment.balance_transactions.create!(company: payment.company, amount_cents:, transaction_type: BalanceTransaction::PAYMENT_FAILED)
+
+ transfer_details = api_service.get_transfer(transfer_id:)
+ amount = transfer_details["targetValue"]
+ currency = transfer_details["targetCurrency"]
+ CompanyWorkerMailer.payment_failed(payment.id, amount, currency).deliver_later
end
end
invoice.update!(status: Invoice::FAILED)
diff --git a/backend/app/views/company_worker_mailer/payment_failed.html.erb b/backend/app/views/company_worker_mailer/payment_failed.html.erb
new file mode 100644
index 0000000000..020c346a09
--- /dev/null
+++ b/backend/app/views/company_worker_mailer/payment_failed.html.erb
@@ -0,0 +1,34 @@
+
+ There was an issue processing your payment of <%= Money.from_amount(@amount, @currency).format(with_currency: true, symbol: false, no_cents_if_whole: true) %>
+
+ Unfortunately, there was an issue processing your payment through Wise. This could be due to:
+
+
+
Incorrect bank account information
+
Bank transfer restrictions
+
Compliance or verification issues
+
Processing errors at the banking institution
+
+
+
+ Please log into your account to verify your bank details are correct and up-to-date. If your bank details appear correct, please contact support for assistance.
+
+
+
+ We'll attempt to process your payment again once the issue is resolved.
+