@@ -111,14 +113,14 @@ export default {
}
.header-wrap {
+ align-items: flex-start;
display: flex;
justify-content: space-between;
- align-items: center;
+ margin-bottom: var(--space-slab);
}
.title-shortcut-key__wrap {
display: flex;
- margin-bottom: var(--space-small);
}
.page-title {
diff --git a/app/javascript/dashboard/helper/inbox.js b/app/javascript/dashboard/helper/inbox.js
index 9355b9aa8..179550086 100644
--- a/app/javascript/dashboard/helper/inbox.js
+++ b/app/javascript/dashboard/helper/inbox.js
@@ -3,32 +3,35 @@ import { INBOX_TYPES } from 'shared/mixins/inboxMixin';
export const getInboxClassByType = (type, phoneNumber) => {
switch (type) {
case INBOX_TYPES.WEB:
- return 'ion-earth';
+ return 'globe-desktop';
case INBOX_TYPES.FB:
- return 'ion-social-facebook';
+ return 'brand-facebook';
case INBOX_TYPES.TWITTER:
- return 'ion-social-twitter';
+ return 'brand-twitter';
case INBOX_TYPES.TWILIO:
return phoneNumber.startsWith('whatsapp')
- ? 'ion-social-whatsapp-outline'
- : 'ion-android-textsms';
+ ? 'brand-whatsapp'
+ : 'brand-sms';
case INBOX_TYPES.WHATSAPP:
- return 'ion-social-whatsapp-outline';
+ return 'brand-whatsapp';
case INBOX_TYPES.API:
- return 'ion-cloud';
+ return 'cloud';
case INBOX_TYPES.EMAIL:
- return 'ion-ios-email';
+ return 'mail';
case INBOX_TYPES.TELEGRAM:
- return 'ion-ios-navigate';
+ return 'brand-telegram';
+
+ case INBOX_TYPES.LINE:
+ return 'brand-line';
default:
- return 'ion-ios-chatbubble';
+ return 'chat';
}
};
diff --git a/app/javascript/dashboard/helper/specs/inbox.spec.js b/app/javascript/dashboard/helper/specs/inbox.spec.js
index 54c3cefad..f6d6aa9f0 100644
--- a/app/javascript/dashboard/helper/specs/inbox.spec.js
+++ b/app/javascript/dashboard/helper/specs/inbox.spec.js
@@ -3,33 +3,35 @@ import { getInboxClassByType } from '../inbox';
describe('#Inbox Helpers', () => {
describe('getInboxClassByType', () => {
it('should return correct class for web widget', () => {
- expect(getInboxClassByType('Channel::WebWidget')).toEqual('ion-earth');
+ expect(getInboxClassByType('Channel::WebWidget')).toEqual(
+ 'globe-desktop'
+ );
});
it('should return correct class for fb page', () => {
expect(getInboxClassByType('Channel::FacebookPage')).toEqual(
- 'ion-social-facebook'
+ 'brand-facebook'
);
});
it('should return correct class for twitter profile', () => {
expect(getInboxClassByType('Channel::TwitterProfile')).toEqual(
- 'ion-social-twitter'
+ 'brand-twitter'
);
});
it('should return correct class for twilio sms', () => {
expect(getInboxClassByType('Channel::TwilioSms', '')).toEqual(
- 'ion-android-textsms'
+ 'brand-sms'
);
});
it('should return correct class for whatsapp', () => {
expect(getInboxClassByType('Channel::TwilioSms', 'whatsapp')).toEqual(
- 'ion-social-whatsapp-outline'
+ 'brand-whatsapp'
);
});
it('should return correct class for Api', () => {
- expect(getInboxClassByType('Channel::Api')).toEqual('ion-cloud');
+ expect(getInboxClassByType('Channel::Api')).toEqual('cloud');
});
it('should return correct class for Email', () => {
- expect(getInboxClassByType('Channel::Email')).toEqual('ion-ios-email');
+ expect(getInboxClassByType('Channel::Email')).toEqual('mail');
});
});
});
diff --git a/app/javascript/dashboard/i18n/locale/ar/chatlist.json b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
index fed68be9b..f64c6bce5 100644
--- a/app/javascript/dashboard/i18n/locale/ar/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "رسالة صورة"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "رسالة صوتية"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "رسالة فيديو"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "مرفقات"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "الموقع الجغرافي"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "قام بمشاركة رابط"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/ca/chatlist.json b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
index 99b32381f..689e5f949 100644
--- a/app/javascript/dashboard/i18n/locale/ca/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Missatge d'imatge"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Missatge d'àudio"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Missatge de vídeo"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Fitxer adjunt"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Ubicació"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "ha compartit una URL"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/cs/chatlist.json b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
index 203b04040..8ca38a3d8 100644
--- a/app/javascript/dashboard/i18n/locale/cs/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Zpráva obrázku"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Zvuková zpráva"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Video zpráva"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Přílohu souboru"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Poloha"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "sdílel URL"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/da/chatlist.json b/app/javascript/dashboard/i18n/locale/da/chatlist.json
index 7ec2bddaa..4c9b04935 100644
--- a/app/javascript/dashboard/i18n/locale/da/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/da/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Billedbesked"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Lydbesked"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Video besked"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Fil Vedhæftning"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Lokation"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "har delt en URL"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/de/chatlist.json b/app/javascript/dashboard/i18n/locale/de/chatlist.json
index 16304316f..4975dec44 100644
--- a/app/javascript/dashboard/i18n/locale/de/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/de/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Bildnachricht"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Audio-Nachricht"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Videonachricht"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Dateianhang"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Ort"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "hat eine URL geteilt"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/el/chatlist.json b/app/javascript/dashboard/i18n/locale/el/chatlist.json
index 093ced9da..4d731b260 100644
--- a/app/javascript/dashboard/i18n/locale/el/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/el/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Μήνυμα εικόνας"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Μήνυμα ήχου"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Μήνυμα βίντεο"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Επισυναπτόμενο αρχείο"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Θέση"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "έχει μοιράσει ένα σύνδεσμο"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/en/chatlist.json b/app/javascript/dashboard/i18n/locale/en/chatlist.json
index 1be18cad9..ae9d81ba3 100644
--- a/app/javascript/dashboard/i18n/locale/en/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/en/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Picture message"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Audio message"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Video message"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "File Attachment"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Location"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "has shared a url"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index 31b01a691..bdc95d1e5 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Mensaje de imagen"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Mensaje de audio"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Mensaje de vídeo"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Archivo adjunto"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Ubicación"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "ha compartido una url"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/fa/chatlist.json b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
index d7e320776..d39027601 100644
--- a/app/javascript/dashboard/i18n/locale/fa/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "پیام تصویری"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "پیام صوتی"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "پیام ویدیویی"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "فایل الصاقی"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "مکان"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "یک آدرس URL به اشتراک گذاشته شده"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/fi/chatlist.json b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
index aba8e7053..609752f67 100644
--- a/app/javascript/dashboard/i18n/locale/fi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Kuvaviesti"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Ääniviesti"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Videoviesti"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Liite"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Sijainti"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "on jakanut URL-osoitteen"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/fr/chatlist.json b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
index 7552ea48b..5aec4e068 100644
--- a/app/javascript/dashboard/i18n/locale/fr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Message image"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Message audio"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Message vidéo"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Pièce jointe"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Localisation"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "a partagé une URL"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/he/chatlist.json b/app/javascript/dashboard/i18n/locale/he/chatlist.json
index 78334b7f8..e5972c1bd 100644
--- a/app/javascript/dashboard/i18n/locale/he/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/he/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "הודעת תמונה"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "הודעות קוליות"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "הודעות וידאו"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "קובץ מצורף"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "מיקום"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "שיתף קישור"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/hi/chatlist.json b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
index 1be18cad9..ae9d81ba3 100644
--- a/app/javascript/dashboard/i18n/locale/hi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Picture message"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Audio message"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Video message"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "File Attachment"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Location"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "has shared a url"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/hu/chatlist.json b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
index ec0adb383..5b410decd 100644
--- a/app/javascript/dashboard/i18n/locale/hu/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Képüzenet"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Hangüzenet"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Videoüzenet"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Csatolt file"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Hely"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "megosztott URL-t tartalmaz"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/id/chatlist.json b/app/javascript/dashboard/i18n/locale/id/chatlist.json
index 3ce926a77..338a2214f 100644
--- a/app/javascript/dashboard/i18n/locale/id/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/id/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Pesan gambar"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Pesan audio"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Pesan video"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Lampiran File"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Lokasi"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "telah membagikan url"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/it/chatlist.json b/app/javascript/dashboard/i18n/locale/it/chatlist.json
index 9b054a4e1..abc69999e 100644
--- a/app/javascript/dashboard/i18n/locale/it/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/it/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Messaggio immagine"
},
"audio": {
- "ICON": "-quantità-alto",
"CONTENT": "Messaggio audio"
},
"video": {
- "ICON": "videocam",
"CONTENT": "Messaggio video"
},
"file": {
- "ICON": "e-documento",
"CONTENT": "File Allegato"
},
"location": {
- "ICON": "Posizione-ios",
"CONTENT": "Localizzazione"
},
"fallback": {
- "ICON": "e-link",
"CONTENT": "ha condiviso un url"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/ja/chatlist.json b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
index d4ff266f5..909dfbf4c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "画像メッセージ"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "音声メッセージ"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "ビデオ メッセージ"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "添付ファイル"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "場所"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "URLを共有しています"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/ko/chatlist.json b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
index aab37eaa8..a9d4660ca 100644
--- a/app/javascript/dashboard/i18n/locale/ko/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "사진 메시지"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "음성 메시지"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "영상 메시지"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "파일 첨부"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "장소"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "URL을 공유함"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/ml/chatlist.json b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
index 8aa9f9fd6..fa6eacd73 100644
--- a/app/javascript/dashboard/i18n/locale/ml/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "ചിത്ര സന്ദേശം"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "ഓഡിയോ സന്ദേശം"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "വീഡിയോ സന്ദേശം"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "ഫയൽ അറ്റാച്ചുമെന്റ്"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "സ്ഥാനം"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "ഒരു യു. ആർ. എൽ പങ്കിട്ടു"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/ne/chatlist.json b/app/javascript/dashboard/i18n/locale/ne/chatlist.json
index 1be18cad9..ae9d81ba3 100644
--- a/app/javascript/dashboard/i18n/locale/ne/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ne/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Picture message"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Audio message"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Video message"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "File Attachment"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Location"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "has shared a url"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/nl/chatlist.json b/app/javascript/dashboard/i18n/locale/nl/chatlist.json
index 752959d0b..ee1912319 100644
--- a/app/javascript/dashboard/i18n/locale/nl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/nl/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Bericht met foto"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Audiobericht"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Videobericht"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Bestandsbijlage"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Locatie"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "heeft een url gedeeld"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/no/chatlist.json b/app/javascript/dashboard/i18n/locale/no/chatlist.json
index f9c973507..059d6544a 100644
--- a/app/javascript/dashboard/i18n/locale/no/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/no/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Bildemelding"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Lydmelding"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Video beskjed"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Vedlegg"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Plassering"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "har delt en URL"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/pl/chatlist.json b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
index d83324f0c..60b217344 100644
--- a/app/javascript/dashboard/i18n/locale/pl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Wiadomość obrazkowa"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Wiadomość audio"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Wiadomość wideo"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Załącznik pliku"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Lokalizacja"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "udostępnił adres url"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/pt/chatlist.json b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
index dcf62496a..f440f3cae 100644
--- a/app/javascript/dashboard/i18n/locale/pt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Mensagem de imagem"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Mensagem de áudio"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Mensagem de vídeo"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Arquivo anexo"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Local:"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "compartilhou uma url"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
index ec403b296..8def2d390 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Mensagem de imagem"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Mensagem de áudio"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Mensagem de vídeo"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Arquivo anexo"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Localização"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "compartilhou uma URL"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/ru/chatlist.json b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
index 761b664d0..4378b853e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Изображение"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Аудиосообщение"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Видео"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Прикрепленный файл"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Местоположение"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "поделился ссылкой"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/sk/chatlist.json b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
index 1be18cad9..ae9d81ba3 100644
--- a/app/javascript/dashboard/i18n/locale/sk/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Picture message"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Audio message"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Video message"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "File Attachment"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Location"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "has shared a url"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/sv/chatlist.json b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
index f74e4473c..52fbbfd89 100644
--- a/app/javascript/dashboard/i18n/locale/sv/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Bildmeddelande"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Ljudmeddelande"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Videomeddelande"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Bifogad fil"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Plats"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "har delat en webbadress"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/ta/chatlist.json b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
index 3c208d637..f2415bfde 100644
--- a/app/javascript/dashboard/i18n/locale/ta/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "பட செய்தி"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "ஆடியோ செய்தி"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "வீடியோ செய்தி"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "பைல் இணைப்புகள்"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "இருப்பிடம்"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "ஒரு URL ஐப் பகிர்ந்துள்ளார்"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/th/chatlist.json b/app/javascript/dashboard/i18n/locale/th/chatlist.json
index 1b565589c..01dcd33a6 100644
--- a/app/javascript/dashboard/i18n/locale/th/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/th/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "ข้อความภาพ"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "ข้อความเสียง"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "ข้อความวิดิโอ"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "เเนบไฟล์"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "สถานที่"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "ได้เเชร์ลิ้ง"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/tr/chatlist.json b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
index fec2cf3a5..9703692ad 100644
--- a/app/javascript/dashboard/i18n/locale/tr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Görsel mesaj"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Sesli mesaj"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Video mesajı"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Dosya eklentisi"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Yer"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "bir url paylaştı"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/uk/chatlist.json b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
index a4dae75ae..273ee26c6 100644
--- a/app/javascript/dashboard/i18n/locale/uk/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Повідомлення з картинкою"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Аудіо-повідомлення"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Відеоповідомлення"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Повідомлення з файлом"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Місцезнаходження"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "поділився посиланням"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/vi/chatlist.json b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
index 8b90c49c5..1f8fa73fd 100644
--- a/app/javascript/dashboard/i18n/locale/vi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "Tin nhắn hình ảnh"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "Tin nhắn thoại"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "Tin nhắn video"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "Tập tin đính kèm"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "Địa điểm"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "có một đường dẫn chia sẻ"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/zh/chatlist.json b/app/javascript/dashboard/i18n/locale/zh/chatlist.json
index 3a9557a2a..1de627a15 100644
--- a/app/javascript/dashboard/i18n/locale/zh/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh/chatlist.json
@@ -53,27 +53,21 @@
],
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "图片消息"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "音频消息"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "视频消息"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "附件"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "位置"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "分享了一个网址"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
index 4da85b374..12da4fe82 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "图片消息"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "音频消息"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "视频消息"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "附件"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "位置"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "分享了一个网址"
}
},
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
index d06313dfe..d8f085107 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
@@ -54,27 +54,21 @@
},
"ATTACHMENTS": {
"image": {
- "ICON": "ion-image",
"CONTENT": "圖片訊息"
},
"audio": {
- "ICON": "ion-volume-high",
"CONTENT": "聲音訊息"
},
"video": {
- "ICON": "ion-ios-videocam",
"CONTENT": "影片訊息"
},
"file": {
- "ICON": "ion-document",
"CONTENT": "附件"
},
"location": {
- "ICON": "ion-ios-location",
"CONTENT": "位置"
},
"fallback": {
- "ICON": "ion-link",
"CONTENT": "分享了一個網址"
}
},
diff --git a/app/javascript/dashboard/i18n/sidebarItems/campaigns.js b/app/javascript/dashboard/i18n/sidebarItems/campaigns.js
index 54c359e8e..18aad271c 100644
--- a/app/javascript/dashboard/i18n/sidebarItems/campaigns.js
+++ b/app/javascript/dashboard/i18n/sidebarItems/campaigns.js
@@ -4,21 +4,21 @@ const campaigns = accountId => ({
routes: ['settings_account_campaigns', 'one_off'],
menuItems: {
back: {
- icon: 'ion-ios-arrow-back',
+ icon: 'chevron-left',
label: 'HOME',
hasSubMenu: false,
toStateName: 'home',
toState: frontendURL(`accounts/${accountId}/dashboard`),
},
ongoingCampaigns: {
- icon: 'ion-arrow-swap',
+ icon: 'arrow-swap',
label: 'ONGOING',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/campaigns/ongoing`),
toStateName: 'settings_account_campaigns',
},
onOffCampaigns: {
- icon: 'ion-radio-waves',
+ icon: 'sound-source',
label: 'ONE_OFF',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/campaigns/one_off`),
diff --git a/app/javascript/dashboard/i18n/sidebarItems/common.js b/app/javascript/dashboard/i18n/sidebarItems/common.js
index 665b813e5..6f52ed54f 100644
--- a/app/javascript/dashboard/i18n/sidebarItems/common.js
+++ b/app/javascript/dashboard/i18n/sidebarItems/common.js
@@ -17,7 +17,7 @@ const common = accountId => ({
],
menuItems: {
assignedToMe: {
- icon: 'ion-chatbox-working',
+ icon: 'chat',
label: 'CONVERSATIONS',
hasSubMenu: false,
key: '',
@@ -26,35 +26,35 @@ const common = accountId => ({
toStateName: 'home',
},
contacts: {
- icon: 'ion-person',
+ icon: 'book-contacts',
label: 'CONTACTS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/contacts`),
toStateName: 'contacts_dashboard',
},
notifications: {
- icon: 'ion-ios-bell',
+ icon: 'alert',
label: 'NOTIFICATIONS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/notifications`),
toStateName: 'notifications_dashboard',
},
report: {
- icon: 'ion-arrow-graph-up-right',
+ icon: 'arrow-trending-lines',
label: 'REPORTS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/reports`),
toStateName: 'settings_account_reports',
},
campaigns: {
- icon: 'ion-speakerphone',
+ icon: 'megaphone',
label: 'CAMPAIGNS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/campaigns`),
toStateName: 'settings_account_campaigns',
},
settings: {
- icon: 'ion-settings',
+ icon: 'settings',
label: 'SETTINGS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings`),
diff --git a/app/javascript/dashboard/i18n/sidebarItems/contacts.js b/app/javascript/dashboard/i18n/sidebarItems/contacts.js
index a1ecf4a7a..1446be274 100644
--- a/app/javascript/dashboard/i18n/sidebarItems/contacts.js
+++ b/app/javascript/dashboard/i18n/sidebarItems/contacts.js
@@ -8,14 +8,14 @@ const contacts = accountId => ({
],
menuItems: {
back: {
- icon: 'ion-ios-arrow-back',
+ icon: 'chevron-left',
label: 'HOME',
hasSubMenu: false,
toStateName: 'home',
toState: frontendURL(`accounts/${accountId}/dashboard`),
},
contacts: {
- icon: 'ion-person',
+ icon: 'contact-card-group',
label: 'ALL_CONTACTS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/contacts`),
diff --git a/app/javascript/dashboard/i18n/sidebarItems/reports.js b/app/javascript/dashboard/i18n/sidebarItems/reports.js
index 66595d691..3b6c94972 100644
--- a/app/javascript/dashboard/i18n/sidebarItems/reports.js
+++ b/app/javascript/dashboard/i18n/sidebarItems/reports.js
@@ -11,49 +11,49 @@ const reports = accountId => ({
],
menuItems: {
back: {
- icon: 'ion-ios-arrow-back',
+ icon: 'chevron-left',
label: 'HOME',
hasSubMenu: false,
toStateName: 'home',
toState: frontendURL(`accounts/${accountId}/dashboard`),
},
reportOverview: {
- icon: 'ion-arrow-graph-up-right',
+ icon: 'arrow-trending-lines',
label: 'REPORTS_OVERVIEW',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/reports/overview`),
toStateName: 'settings_account_reports',
},
csatReports: {
- icon: 'ion-happy',
+ icon: 'emoji',
label: 'CSAT',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/reports/csat`),
toStateName: 'csat_reports',
},
agentReports: {
- icon: 'ion-person-stalker',
+ icon: 'people',
label: 'REPORTS_AGENT',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/reports/agent`),
toStateName: 'agent_reports',
},
labelReports: {
- icon: 'ion-pricetags',
+ icon: 'tag',
label: 'REPORTS_LABEL',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/reports/label`),
toStateName: 'label_reports',
},
inboxReports: {
- icon: 'ion-archive',
+ icon: 'mail-inbox-all',
label: 'REPORTS_INBOX',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/reports/inboxes`),
toStateName: 'inbox_reports',
},
teamReports: {
- icon: 'ion-ios-people',
+ icon: 'people-team',
label: 'REPORTS_TEAM',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/reports/teams`),
diff --git a/app/javascript/dashboard/i18n/sidebarItems/settings.js b/app/javascript/dashboard/i18n/sidebarItems/settings.js
index 23f59bd7b..fa3660320 100644
--- a/app/javascript/dashboard/i18n/sidebarItems/settings.js
+++ b/app/javascript/dashboard/i18n/sidebarItems/settings.js
@@ -32,42 +32,42 @@ const settings = accountId => ({
],
menuItems: {
back: {
- icon: 'ion-ios-arrow-back',
+ icon: 'chevron-left',
label: 'HOME',
hasSubMenu: false,
toStateName: 'home',
toState: frontendURL(`accounts/${accountId}/dashboard`),
},
agents: {
- icon: 'ion-person-stalker',
+ icon: 'people',
label: 'AGENTS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings/agents/list`),
toStateName: 'agent_list',
},
teams: {
- icon: 'ion-ios-people',
+ icon: 'people-team',
label: 'TEAMS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings/teams/list`),
toStateName: 'settings_teams_list',
},
inboxes: {
- icon: 'ion-archive',
+ icon: 'mail-inbox-all',
label: 'INBOXES',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings/inboxes/list`),
toStateName: 'settings_inbox_list',
},
labels: {
- icon: 'ion-pricetags',
+ icon: 'tag',
label: 'LABELS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings/labels/list`),
toStateName: 'labels_list',
},
attributes: {
- icon: 'ion-code',
+ icon: 'code',
label: 'CUSTOM_ATTRIBUTES',
hasSubMenu: false,
toState: frontendURL(
@@ -76,14 +76,14 @@ const settings = accountId => ({
toStateName: 'attributes_list',
},
automation: {
- icon: 'ion-wrench',
+ icon: 'autocorrect',
label: 'AUTOMATION',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings/automation/list`),
toStateName: 'automation_list',
},
cannedResponses: {
- icon: 'ion-chatbox-working',
+ icon: 'chat-multiple',
label: 'CANNED_RESPONSES',
hasSubMenu: false,
toState: frontendURL(
@@ -92,21 +92,21 @@ const settings = accountId => ({
toStateName: 'canned_list',
},
settings_integrations: {
- icon: 'ion-flash',
+ icon: 'flash-on',
label: 'INTEGRATIONS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings/integrations`),
toStateName: 'settings_integrations',
},
settings_applications: {
- icon: 'ion-asterisk',
+ icon: 'star-emphasis',
label: 'APPLICATIONS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings/applications`),
toStateName: 'settings_applications',
},
general_settings_index: {
- icon: 'ion-gear-a',
+ icon: 'settings',
label: 'ACCOUNT_SETTINGS',
hasSubMenu: false,
toState: frontendURL(`accounts/${accountId}/settings/general`),
diff --git a/app/javascript/dashboard/mixins/specs/attributeFixtures.js b/app/javascript/dashboard/mixins/specs/attributeFixtures.js
index 9b0cc0fc1..4ade79cde 100644
--- a/app/javascript/dashboard/mixins/specs/attributeFixtures.js
+++ b/app/javascript/dashboard/mixins/specs/attributeFixtures.js
@@ -18,7 +18,7 @@ export default [
attribute_model: 'conversation_attribute',
created_at: '2021-09-16T13:06:47.329Z',
default_value: null,
- icon: 'ion-calculator',
+ icon: 'fluent-calculator',
id: 10,
updated_at: '2021-09-22T10:42:25.873Z',
value: 2021,
diff --git a/app/javascript/dashboard/mixins/specs/attributeMixin.spec.js b/app/javascript/dashboard/mixins/specs/attributeMixin.spec.js
index 222b35838..0c98f45c8 100644
--- a/app/javascript/dashboard/mixins/specs/attributeMixin.spec.js
+++ b/app/javascript/dashboard/mixins/specs/attributeMixin.spec.js
@@ -70,7 +70,7 @@ describe('attributeMixin', () => {
attribute_model: 'conversation_attribute',
created_at: '2021-09-16T13:06:47.329Z',
default_value: null,
- icon: 'ion-calculator',
+ icon: 'fluent-calculator',
id: 10,
updated_at: '2021-09-22T10:42:25.873Z',
value: 2021,
diff --git a/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue b/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue
index 74b92ba32..d828ee412 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactAttribute.vue
@@ -36,7 +36,7 @@
variant="clear link"
size="small"
color-scheme="secondary"
- icon="ion-compose"
+ icon="edit"
class-names="edit-button"
@click="onEdit"
/>
diff --git a/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue b/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue
index 97e6f4f66..abe67471b 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactDropdownItem.vue
@@ -10,10 +10,11 @@
- {{ email }}
+
+ {{ email }}
-
+
{{ phoneNumber }}
{{ '---' }}
@@ -102,4 +103,9 @@ export default {
width: auto;
}
}
+
+.merge-contact--icon {
+ margin-bottom: var(--space-minus-micro);
+ margin-right: var(--space-micro);
+}
diff --git a/app/javascript/dashboard/modules/contact/components/ContactFields.vue b/app/javascript/dashboard/modules/contact/components/ContactFields.vue
index cf58b9a32..d7de3ea09 100644
--- a/app/javascript/dashboard/modules/contact/components/ContactFields.vue
+++ b/app/javascript/dashboard/modules/contact/components/ContactFields.vue
@@ -1,9 +1,11 @@