chore: Improve location display in sidebar (#1509)

- Log IP Address on widget load
- Save country code to contact

app/controllers/api/v1/accounts/contacts_controller.rb

@@ -35,7 +35,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   def create
     ActiveRecord::Base.transaction do
       @contact = Current.account.contacts.new(contact_params)
-      set_ip
       @contact.save!
       @contact_inbox = build_contact_inbox
     end
@@ -43,7 +42,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
 
   def update
     @contact.assign_attributes(contact_update_params)
-    set_ip
     @contact.save!
   rescue ActiveRecord::RecordInvalid => e
     render json: {
@@ -99,11 +97,4 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   def fetch_contact
     @contact = Current.account.contacts.includes(contact_inboxes: [:inbox]).find(params[:id])
   end
-
-  def set_ip
-    return if @contact.account.feature_enabled?('ip_lookup')
-
-    @contact[:additional_attributes][:created_at_ip] ||= request.remote_ip
-    @contact[:additional_attributes][:updated_at_ip] = request.remote_ip
-  end
 end

app/controllers/widgets_controller.rb

@@ -41,13 +41,21 @@ class WidgetsController < ActionController::Base
   def build_contact
     return if @contact.present?
 
-    contact_inbox = @web_widget.create_contact_inbox
+    contact_inbox = @web_widget.create_contact_inbox(additional_attributes)
     @contact = contact_inbox.contact
 
     payload = { source_id: contact_inbox.source_id, inbox_id: @web_widget.inbox.id }
     @token = ::Widget::TokenService.new(payload: payload).generate_token
   end
 
+  def additional_attributes
+    if @web_widget.inbox.account.feature_enabled?('ip_lookup')
+      { created_at_ip: request.remote_ip }
+    else
+      {}
+    end
+  end
+
   def permitted_params
     params.permit(:website_token, :cw_conversation)
   end