From 9cf66069c571daf8c413651a7c8c2227533bd091 Mon Sep 17 00:00:00 2001 From: "mateus.ricciardi@blip.ai" Date: Tue, 18 Jun 2024 16:59:05 -0300 Subject: [PATCH 1/2] fix(ExternalMessage): Fixing metadata validation when document or message There are cases where it is necessary to check if a message has a document with a metadata for external messages and if you already have the document in hand --- src/components/BlipGroupCard.vue | 2 +- src/utils/externalMessages.js | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/components/BlipGroupCard.vue b/src/components/BlipGroupCard.vue index a48615cd..9bee74a9 100644 --- a/src/components/BlipGroupCard.vue +++ b/src/components/BlipGroupCard.vue @@ -38,7 +38,7 @@ :position="group.position" :date="group.date" :failed-to-send-msg="failedMessageNotification(group.msgs[0].type)" - :is-external-message="checkIsExternalMessage(group.msgs[0].document)" + :is-external-message="checkIsExternalMessage(group.msgs[0])" :external-message-text="externalMessageText" :is-group="true" :show-alert-icon="Boolean(onFailedClickIcon)" diff --git a/src/utils/externalMessages.js b/src/utils/externalMessages.js index e248a5dd..2450a794 100644 --- a/src/utils/externalMessages.js +++ b/src/utils/externalMessages.js @@ -1,10 +1,19 @@ -function checkIsExternalMessage(document) { +function checkIsExternalMessage(msg) { + let innerDocument + + if (msg && msg.document) { + innerDocument = msg.document + } else { + innerDocument = msg + } + const isExternalMessage = Boolean( - document && - document.metadata && - document.metadata['messageEmitter'] && - document.metadata['messageEmitter'] === 'externalMessages' + innerDocument && + innerDocument.metadata && + innerDocument.metadata['messageEmitter'] && + innerDocument.metadata['messageEmitter'] === 'externalMessages' ) + return isExternalMessage } From 1ebb40c615655aaf6dbd518d8ee1433b43828d8d Mon Sep 17 00:00:00 2001 From: Vitor Marchena Date: Wed, 19 Jun 2024 09:45:02 -0300 Subject: [PATCH 2/2] fix(CopyAndPaste): Remove fill-place css --- src/components/CopyAndPaste.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/CopyAndPaste.vue b/src/components/CopyAndPaste.vue index 7c54153a..6378dfa1 100644 --- a/src/components/CopyAndPaste.vue +++ b/src/components/CopyAndPaste.vue @@ -25,7 +25,7 @@ {{ this.document.footer }}
- + {{ this.document.button.text }} @@ -266,13 +266,13 @@ if (this.errors.any() || ($event && $event.shiftKey)) { return } - + if ($event) { $event.stopPropagation() $event.preventDefault() $event.returnValue = false } - + this.$validator.validateAll().then((result) => { if (!result) { return @@ -305,7 +305,8 @@ } .button-container { - width: -webkit-fill-available; + width: 100%; + padding: 8px 16px; cursor: pointer; } @@ -336,4 +337,4 @@ text-overflow: ellipsis; direction: ltr; } - \ No newline at end of file +