rodrigo/iachat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chore: fix merge

Browse Source
This commit is contained in:
gabrieljablonski 2025-07-16 11:05:45 -03:00
parent 6f3173e63d
commit e8b3abee9a
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
View File

@ -147,7 +147,8 @@ export default {
this.isAPIInbox || this.isAPIInbox ||
(this.isAnEmailChannel && !this.inbox.provider) || (this.isAnEmailChannel && !this.inbox.provider) ||
this.shouldShowWhatsAppConfiguration || this.shouldShowWhatsAppConfiguration ||
this.isAWebWidgetInbox this.isAWebWidgetInbox ||
this.isAWhatsAppBaileysChannel
) { ) {
visibleToAllChannelTabs = [ visibleToAllChannelTabs = [
...visibleToAllChannelTabs, ...visibleToAllChannelTabs,

2
app/models/conversation.rb
View File

@ -146,7 +146,7 @@ class Conversation < ApplicationRecord
# FIXME: implement state machine with aasm # FIXME: implement state machine with aasm
self.status = open? ? :resolved : :open self.status = open? ? :resolved : :open
self.status = :open if pending? || snoozed? self.status = :open if pending? || snoozed?
save! save # rubocop:disable Rails/SaveBang
end end
def toggle_priority(priority = nil) def toggle_priority(priority = nil)

2
spec/services/twilio/oneoff_sms_campaign_service_spec.rb
View File

@ -66,7 +66,7 @@ describe Twilio::OneoffSmsCampaignService do
contact.update_labels([label1.title]) contact.update_labels([label1.title])
expect(Liquid::CampaignTemplateService).to receive(:new).with(campaign: campaign, contact: contact).and_call_original expect(Liquid::CampaignTemplateService).to receive(:new).with(campaign: campaign, contact: contact).and_call_original
expect(twilio_messages).to receive(:create).once expect(twilio_messages).to receive(:create!).once
sms_campaign_service.perform sms_campaign_service.perform
end end

2
spec/services/whatsapp/oneoff_campaign_service_spec.rb
View File

@ -138,7 +138,7 @@ describe Whatsapp::OneoffCampaignService do
context 'when template_params is missing' do context 'when template_params is missing' do
let(:template_params) { nil } let(:template_params) { nil }
it 'skips contacts and logs error' do it 'skips contacts and logs error', skip: 'Not-null constraint on campaigns table does not allow this' do
contact = create(:contact, :with_phone_number, account: account) contact = create(:contact, :with_phone_number, account: account)
contact.update_labels([label1.title]) contact.update_labels([label1.title])