diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb index 4eb93eef..1e7bc33d 100644 --- a/lib/submissions/generate_audit_trail.rb +++ b/lib/submissions/generate_audit_trail.rb @@ -302,7 +302,7 @@ module Submissions }, completed_event.data['ip'] && { text: "IP: #{completed_event.data['ip']}\n" }, completed_event.data['sid'] && { text: "#{I18n.t('session_id')}: #{completed_event.data['sid']}\n" }, - completed_event.data['ua'] && { text: "User agent: #{completed_event.data['ua']}\n" }, + completed_event.data['ua'] && { text: "User agent: #{completed_event.data['ua'].to_s.squish}\n" }, submitter.timezone && { text: "Time zone: #{submitter.timezone.to_s.sub('Kiev', 'Kyiv')}\n" }, "\n" ].compact_blank, line_spacing: 1.3, padding: [10, 20, 20, 0] @@ -480,7 +480,7 @@ module Submissions submitter.name || submitter.email || submitter.phone end - submitter_name = TextUtils.maybe_rtl_reverse(submitter_name.to_s) + submitter_name = TextUtils.maybe_rtl_reverse(submitter_name.to_s.squish) text = if event.event_type == 'complete_verification' @@ -490,12 +490,12 @@ module Submissions (invited_submitter = submission.submitters.find { |e| e.uuid == event.data['uuid'] }) && (name = submission.template_submitters.find { |e| e['uuid'] == event.data['uuid'] }&.dig('name')) invited_submitter_name = TextUtils.maybe_rtl_reverse( - [invited_submitter.name || invited_submitter.email || invited_submitter.phone, name].join(' ') + [invited_submitter.name || invited_submitter.email || invited_submitter.phone, name].join(' ').squish ) I18n.t('submission_event_names.invite_party_by_html', invited_submitter_name:, submitter_name:) elsif with_audit_sender && (event.event_type == 'send_email' || event.event_type == 'send_sms') - created_by_name = TextUtils.maybe_rtl_reverse(submission.created_by_user.full_name) + created_by_name = TextUtils.maybe_rtl_reverse(submission.created_by_user.full_name.to_s.squish) [ I18n.t("submission_event_names.#{event.event_type}_to_html", submitter_name:), @@ -504,7 +504,7 @@ module Submissions elsif event.event_type == 'delegate_form' from = event.data['old_email'].presence || versions.rfind { |v| v.created_at <= event.event_timestamp }&.then { |v| v.name || v.phone } - from = TextUtils.maybe_rtl_reverse(from.to_s) + from = TextUtils.maybe_rtl_reverse(from.to_s.squish) I18n.t('submission_event_names.delegate_form_by_html', from:, to: event.data['email']) elsif event.event_type.include?('send_') I18n.t("submission_event_names.#{event.event_type}_to_html", submitter_name:)