KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Lock icon colour issue in private messages (#4009)

Browse source 
* fix: Lock icon colour issue in private messages

* minor fixes
This commit is contained in:
Sivin Varghese 2022-02-17 18:58:53 +05:30 committed by GitHub
parent b9025a98d3
commit 2586c8e7e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
View file

@ -19,14 +19,16 @@
v-if="isPrivate"
v-tooltip.top-start="$t('CONVERSATION.VISIBLE_TO_AGENTS')"
icon="lock-closed"
class="action--icon"
class="action--icon lock--icon--private"
size="16"
@mouseenter="isHovered = true"
@mouseleave="isHovered = false"
/>
<button @click="onTweetReply">
<button
v-if="isATweet && (isIncoming || isOutgoing) && sourceId"
@click="onTweetReply"
>
<fluent-icon
v-if="isATweet && (isIncoming || isOutgoing) && sourceId"
v-tooltip.top-start="$t('CHAT_LIST.REPLY_TO_TWEET')"
icon="arrow-reply"
class="action--icon cursor-pointer"
@ -141,6 +143,10 @@ export default {
.action--icon {
color: var(--white);
}
.lock--icon--private {
color: var(--s-400);
}
}
}
@ -205,7 +211,7 @@ export default {
.is-private {
.message-text--metadata {
align-items: flex-end;
align-items: center;
.time {
color: var(--s-400);

9
app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
View file

@ -352,8 +352,8 @@ export default {
switch (type) {
case 'assign_team':
case 'send_email_to_team':
return this.$store.getters['teams/getTeams'];
case 'add_label':
return this.$store.getters['teams/getTeams'];
case 'add_label':
return this.$store.getters['labels/getLabels'].map(i => {
return {
id: i.title,
@ -441,9 +441,8 @@ export default {
const formattedConditions = automation.conditions.map(condition => {
const inputType = this.automationTypes[
automation.event_name
].conditions.find(
item => item.key === condition.attribute_key
).inputType;
].conditions.find(item => item.key === condition.attribute_key)
.inputType;
if (inputType === 'plain_text') {
return {
...condition,