From 876cb15cb1ebd6afbb5dbcea67277b0ae453b645 Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Tue, 3 Oct 2023 23:39:40 +0100 Subject: [PATCH 001/151] fix(chat): added ellipsis for long chat names --- src/components/ChatPreview.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue index d47e4c5a1..767810f2b 100644 --- a/src/components/ChatPreview.vue +++ b/src/components/ChatPreview.vue @@ -276,6 +276,10 @@ export default { } &__title { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-right: 80px; line-height: 24px; margin-bottom: 0; } From 548609f963e7c4450382409d9aa57b415dc2c28e Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Wed, 4 Oct 2023 00:45:27 +0100 Subject: [PATCH 002/151] feat(Chat): made the button round --- src/components/Chat/Chat.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue index 9d5c97bc3..c9dc5e7ae 100644 --- a/src/components/Chat/Chat.vue +++ b/src/components/Chat/Chat.vue @@ -232,6 +232,7 @@ v-if="!isScrolledToBottom" class="ma-0 grey--text" color="grey lighten-3" + :icon="true" depressed fab size="small" From e7d41198e7f86d76c0acf0b936f56e7fb60b04e6 Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Wed, 4 Oct 2023 04:32:51 +0100 Subject: [PATCH 003/151] feat(Chat): added a counter of new messages on the scroll to bottom --- src/components/Chat/Chat.vue | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue index c9dc5e7ae..5ac13c064 100644 --- a/src/components/Chat/Chat.vue +++ b/src/components/Chat/Chat.vue @@ -228,18 +228,30 @@ From 835569ffa2ed8352c5a7db5515d2e00e46fb6342 Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Wed, 4 Oct 2023 04:57:06 +0100 Subject: [PATCH 004/151] fix: review changes --- src/components/Chat/Chat.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue index 5ac13c064..94394cedd 100644 --- a/src/components/Chat/Chat.vue +++ b/src/components/Chat/Chat.vue @@ -230,25 +230,23 @@ From 214554b3e31003cc63c1b2ef841ecb6b3df167be Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Wed, 4 Oct 2023 05:08:40 +0100 Subject: [PATCH 006/151] fix: undefined --- src/components/Chat/Chat.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue index b2efd7aca..9ba8a5635 100644 --- a/src/components/Chat/Chat.vue +++ b/src/components/Chat/Chat.vue @@ -234,7 +234,7 @@ location="top center" v-if="!isScrolledToBottom" color="primary" - :content="numOfNewMessages > 0 ? numOfNewMessages : none" + :content="numOfNewMessages > 0 ? numOfNewMessages : undefined" > Date: Wed, 4 Oct 2023 19:11:50 +0100 Subject: [PATCH 007/151] fix: positioned the date through the flex --- src/components/ChatPreview.vue | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue index 767810f2b..0efcb4b77 100644 --- a/src/components/ChatPreview.vue +++ b/src/components/ChatPreview.vue @@ -27,13 +27,18 @@
- +
+ +
+ {{ formatDate(createdAt) }} +
+
- -
- {{ formatDate(createdAt) }} -
@@ -262,6 +263,7 @@ export default { /** * 1. Message/Transaction content. */ + .chat-brief { position: relative; @@ -275,11 +277,15 @@ export default { margin-right: 16px; } + &__heading { + display: flex; + justify-content: space-between; + } + &__title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - margin-right: 80px; line-height: 24px; margin-bottom: 0; } @@ -294,7 +300,8 @@ export default { &__date { @include a-text-explanation-small(); - position: absolute; + margin-left: 16px; + white-space: nowrap; top: 16px; right: 16px; } From 1f4cc00da4fc2bb35be27534365e2181fd539290 Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Wed, 4 Oct 2023 19:15:23 +0100 Subject: [PATCH 008/151] refactor --- src/components/ChatPreview.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue index 0efcb4b77..3f69cf9b4 100644 --- a/src/components/ChatPreview.vue +++ b/src/components/ChatPreview.vue @@ -263,7 +263,6 @@ export default { /** * 1. Message/Transaction content. */ - .chat-brief { position: relative; From f4a6c046549ae6d32dbebefb99c25e167091c249 Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Wed, 4 Oct 2023 22:00:13 +0100 Subject: [PATCH 009/151] fix: margin --- src/components/ChatPreview.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue index 3f69cf9b4..b832cdede 100644 --- a/src/components/ChatPreview.vue +++ b/src/components/ChatPreview.vue @@ -301,8 +301,7 @@ export default { @include a-text-explanation-small(); margin-left: 16px; white-space: nowrap; - top: 16px; - right: 16px; + margin-top: 4px; } &__badge { From 3a2ee1454603e70be5bca428384026dd0a0a895a Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Wed, 4 Oct 2023 23:24:59 +0100 Subject: [PATCH 010/151] fix: deleted unnecessary styles --- src/components/ChatPreview.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue index b832cdede..c854e29dd 100644 --- a/src/components/ChatPreview.vue +++ b/src/components/ChatPreview.vue @@ -282,9 +282,6 @@ export default { } &__title { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; line-height: 24px; margin-bottom: 0; } From 50020fb656f749493ca7408e512864df1b16b90d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 17:35:31 +0000 Subject: [PATCH 011/151] chore(deps-dev): bump electron from 26.2.2 to 26.2.4 Bumps [electron](https://github.com/electron/electron) from 26.2.2 to 26.2.4. - [Release notes](https://github.com/electron/electron/releases) - [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md) - [Commits](https://github.com/electron/electron/compare/v26.2.2...v26.2.4) --- updated-dependencies: - dependency-name: electron dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 40f8459fb..8fe0ab3cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ "@vue/test-utils": "^2.4.1", "autoprefixer": "^10.4.16", "cross-env": "^7.0.3", - "electron": "^26.2.2", + "electron": "^26.2.4", "electron-builder": "^24.6.4", "electron-devtools-installer": "^3.2.0", "eslint": "^8.49.0", @@ -99,7 +99,7 @@ "jest-serializer-vue": "^3.1.0", "jsdom": "^22.1.0", "lorem-ipsum": "^2.0.8", - "postcss": "latest", + "postcss": "*", "prettier": "^3.0.3", "sass": "^1.68.0", "sass-loader": "^13.3.2", @@ -7666,9 +7666,9 @@ } }, "node_modules/electron": { - "version": "26.2.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-26.2.2.tgz", - "integrity": "sha512-Ihb3Zt4XYnHF52DYSq17ySkgFqJV4OT0VnfhUYZASAql7Vembz3VsAq7mB3OALBHXltAW34P8BxTIwTqZaMS3g==", + "version": "26.2.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-26.2.4.tgz", + "integrity": "sha512-weMUSMyDho5E0DPQ3breba3D96IxwNvtYHjMd/4/wNN3BdI5s3+0orNnPVGJFcLhSvKoxuKUqdVonUocBPwlQA==", "dev": true, "hasInstallScript": true, "dependencies": { diff --git a/package.json b/package.json index 259e6b845..3be0fcdcd 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "@vue/test-utils": "^2.4.1", "autoprefixer": "^10.4.16", "cross-env": "^7.0.3", - "electron": "^26.2.2", + "electron": "^26.2.4", "electron-builder": "^24.6.4", "electron-devtools-installer": "^3.2.0", "eslint": "^8.49.0", From ac25d4c01c023d6c8ad657243bb3c2e69a612c9b Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Thu, 5 Oct 2023 23:11:17 +0100 Subject: [PATCH 012/151] fix: mark as read if the tab is visible and scrolled to the bottom --- src/components/Chat/Chat.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue index 9ba8a5635..c0de6af1c 100644 --- a/src/components/Chat/Chat.vue +++ b/src/components/Chat/Chat.vue @@ -442,7 +442,7 @@ export default { this.$refs.chat.scrollToBottom() } - if (!Visibility.hidden()) this.markAsRead() + if (!Visibility.hidden() && this.isScrolledToBottom) this.markAsRead() }) }, // watch `isFulfilled` when opening chat directly from address bar From 90109ecfed30a7b84607e2ac7b5eda4329cf513a Mon Sep 17 00:00:00 2001 From: martiliones Date: Fri, 6 Oct 2023 05:24:34 +0600 Subject: [PATCH 013/151] refactor(ChatPreview): align date using flexbox --- src/components/ChatPreview.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ChatPreview.vue b/src/components/ChatPreview.vue index c854e29dd..6097cfc71 100644 --- a/src/components/ChatPreview.vue +++ b/src/components/ChatPreview.vue @@ -279,6 +279,7 @@ export default { &__heading { display: flex; justify-content: space-between; + align-items: center; } &__title { @@ -298,7 +299,6 @@ export default { @include a-text-explanation-small(); margin-left: 16px; white-space: nowrap; - margin-top: 4px; } &__badge { From 92881686dc500d26eac8792456a32a1dcaf4cb2b Mon Sep 17 00:00:00 2001 From: Yulia Hermak Date: Fri, 6 Oct 2023 02:44:54 +0100 Subject: [PATCH 014/151] feat: preserve message text in the input field --- src/components/AChat/AChatForm.vue | 8 +++++++- src/components/Chat/Chat.vue | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/AChat/AChatForm.vue b/src/components/AChat/AChatForm.vue index 90f165236..880b1f0a6 100644 --- a/src/components/AChat/AChatForm.vue +++ b/src/components/AChat/AChatForm.vue @@ -54,6 +54,10 @@ export default { showDivider: { type: Boolean, default: false + }, + clearInputValueOnSend: { + type: Boolean, + default: true } }, emits: ['message', 'esc'], @@ -119,7 +123,9 @@ export default { methods: { submitMessage() { this.$emit('message', this.message) - this.message = '' + if (this.clearInputValueOnSend === true) { + this.message = '' + } // Fix textarea height to 1 row after miltiline message send this.calculateInputHeight() this.focus() diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue index 9d5c97bc3..f96d2654f 100644 --- a/src/components/Chat/Chat.vue +++ b/src/components/Chat/Chat.vue @@ -209,6 +209,7 @@ :message-text="$route.query.messageText" @message="onMessage" @esc="replyMessageId = -1" + :clearInputValueOnSend="this.$store.state.balance < 0.001 === false" >