Merge branch 'release/1.11.1' into master

app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue

@@ -112,20 +112,19 @@ export default {
       return `${this.browser.browser_name || ''} ${this.browser
         .browser_version || ''}`;
     },
+    contactAdditionalAttributes() {
+      return this.contact.additional_attributes || {};
+    },
     ipAddress() {
-      const {
+      const { created_at_ip: createdAtIp } = this.contactAdditionalAttributes;
-        additional_attributes: { created_at_ip: createdAtIp },
-      } = this.contact;
       return createdAtIp;
     },
     location() {
       const {
-        additional_attributes: {
+        country = '',
-          country = '',
+        city = '',
-          city = '',
+        country_code: countryCode,
-          country_code: countryCode,
+      } = this.contactAdditionalAttributes;
-        },
-      } = this.contact;
       const cityAndCountry = [city, country].filter(item => !!item).join(', ');
 
       if (!cityAndCountry) {

config/app.yml

@@ -1,5 +1,5 @@
 shared: &shared
-  version: '1.11.0'
+  version: '1.11.1'
 
 development:
   <<: *shared

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/javascript --fix",