fix: layout fixes #782

S-FrontendDev · 2025-04-30T18:47:47Z

No description provided.

vercel · 2025-04-30T18:47:52Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
adamant-im	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	May 14, 2025 5:09am

S-FrontendDev · 2025-04-30T18:49:15Z

Feat: UX. Contact list and chat messages on the same screen (for Desktop)

github-actions · 2025-04-30T18:49:58Z

Deployed to https://msg-adamant-pr-782.surge.sh 🚀

skranee · 2025-04-30T20:54:36Z

src/components/BuyTokensDialog.vue

@@ -104,6 +104,9 @@ export default {
    }
  },
  methods: {


May be convert this file to composition? It seems like it's going to be fast

skranee · 2025-04-30T20:57:39Z

src/views/Login.vue

+        />
+      </container>
+    </v-row>
+  </component>
 </template>

 <script>


This one too, doesn't seem hard to convert to composition

skranee · 2025-04-30T21:00:19Z

src/views/Options.vue

@@ -206,7 +207,13 @@ export default {
    CurrencySwitcher,
    PasswordSetDialog
  },
-  mixins: [scrollPosition],


You transported the scrollbar position logic to mounted, right?

scrollPosition mixin didn't work at all, so I created new scroll position logic

skranee · 2025-04-30T21:01:34Z

src/views/Options.vue

+  props: {
+    sidebarLayoutRef: {
+      type: Object,
+      required: false,


No need in required here

bludnic · 2025-05-01T00:57:15Z

src/views/Options.vue

+  mounted() {
+    nextTick(() => {
+      if (this.sidebarLayoutRef) {
+        const scrollTopValue = Number(localStorage.getItem('optionsScrollTop')) || 0
+        this.sidebarLayoutRef.scrollTo({
+          top: scrollTopValue
+        })
+      }
+    })
+  },
+  beforeUnmount() {
+    localStorage.setItem('optionsScrollTop', this.sidebarLayoutRef?.scrollTop || 0)
+  },


Why you store the scroll position in the LocalStorage?

moved to vuex store already

bludnic · 2025-05-01T21:12:48Z

src/views/Options.vue

    onCheckStayLoggedIn() {
      if (!this.stayLoggedIn) {
        isIDBSupported
          .then(() => {
            this.passwordDialog = true
+
+            window.addEventListener('keydown', this.onKeydownHandler, true)
          })


Looks like workaround. Can you explain why you put the listener here?

you are right, it's better to move it inside dialog component

adamantmm · 2025-05-03T17:35:21Z

@S-FrontendDev
Please update.

skranee · 2025-05-04T13:18:16Z

src/components/BuyTokensDialog.vue

@@ -56,64 +56,68 @@
  </v-dialog>
 </template>

-<script>
+<script setup>


to TypeScript

bludnic · 2025-05-09T14:32:55Z

src/views/Options.vue

+  mounted() {
+    nextTick(() => {
+      if (this.sidebarLayoutRef && this.scrollTopPosition) {
+        this.sidebarLayoutRef.scrollTo({
+          top: this.scrollTopPosition
+        })
+      }
+    })
+  },
+  beforeUnmount() {
+    if (this.sidebarLayoutRef) {
+      this.scrollTopPosition = this.sidebarLayoutRef.scrollTop || 0
+    }
+  },
  computed: {
    className: () => 'settings-view',
    stayLoggedIn() {
      return this.$store.state.options.stayLoggedIn
    },
+    scrollTopPosition: {
+      get() {
+        return this.$store.state.options.scrollTopPosition
+      },
+      set(value) {
+        this.$store.commit('options/updateOption', {
+          key: 'scrollTopPosition',
+          value
+        })
+      }
+    },


Can we move the scroll position logic into a hook and reuse it in every View where it's needed? @S-FrontendDev

bludnic · 2025-05-09T14:37:49Z

src/store/modules/options/index.js

@@ -12,11 +12,13 @@ const state = () => ({
  currentWallet: Cryptos.ADM, // current Wallet Tab on Account view (this is not an option)
  useSocketConnection: true,
  suppressWarningOnAddressesNotification: false,
-  currentRate: Rates.USD
+  currentRate: Rates.USD,
+  scrollTopPosition: 0


Doesn't seem right to store the scroll position here. That's a common prop for every page, not just Settings.vue. I suggest to store that value inside the router instance.

This is how it worked before using mixins:
https://github.com/Adamant-im/adamant-im/blob/dev/src/mixins/scrollPosition.js#L3-L10

Try to replicate that logic, but using hooks.

Did it ever work this way? I've tried multiple ways to use $route.meta to store scroll positions, but the router/scrollBehavior console logs clearly show that when navigating to the page, only the original meta (defined during router initialization) is being used

adamantmm · 2025-05-16T05:19:47Z

@bludnic @dvelikiy
Please review

fix: layout fixes

c4f263b

S-FrontendDev requested a review from a team as a code owner April 30, 2025 18:47

S-FrontendDev temporarily deployed to testing April 30, 2025 18:47 — with GitHub Actions Inactive

vercel bot deployed to Preview April 30, 2025 18:49 View deployment

skranee requested changes Apr 30, 2025

View reviewed changes

bludnic reviewed May 1, 2025

View reviewed changes

fix: review fix

90fddb0

S-FrontendDev temporarily deployed to testing May 4, 2025 08:00 — with GitHub Actions Inactive

vercel bot deployed to Preview May 4, 2025 08:01 View deployment

S-FrontendDev requested review from bludnic and skranee May 4, 2025 08:10

skranee reviewed May 4, 2025

View reviewed changes

src/components/BuyTokensDialog.vue Outdated

@@ -56,64 +56,68 @@

</v-dialog>

</template>

<script>

<script setup>

Copy link

Collaborator

skranee May 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to TypeScript

fix: review fix

d91640d

S-FrontendDev temporarily deployed to testing May 5, 2025 03:24 — with GitHub Actions Inactive

S-FrontendDev requested a review from skranee May 5, 2025 03:24

vercel bot deployed to Preview May 5, 2025 03:25 View deployment

Adamant-im deleted a comment from psy21d May 5, 2025

skranee approved these changes May 8, 2025

View reviewed changes

adamant-al requested review from dvelikiy and a team May 8, 2025 18:31

bludnic reviewed May 9, 2025

View reviewed changes

fix: passwordSetDialog component to composition api

f067767

vercel bot deployed to Preview May 10, 2025 07:17 View deployment

fix: merge conflicts

0a1accd

S-FrontendDev temporarily deployed to testing May 11, 2025 06:06 — with GitHub Actions Inactive

vercel bot deployed to Preview May 11, 2025 06:07 View deployment

S-FrontendDev mentioned this pull request May 11, 2025

v4.10.0 #788

Open

S-FrontendDev requested a review from bludnic May 12, 2025 05:58

refactor: convert Options to composition api

d983e02

S-FrontendDev temporarily deployed to testing May 14, 2025 05:08 — with GitHub Actions Inactive

vercel bot deployed to Preview May 14, 2025 05:09 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: layout fixes #782

fix: layout fixes #782

S-FrontendDev commented Apr 30, 2025

vercel bot commented Apr 30, 2025 •

edited

Loading

S-FrontendDev commented Apr 30, 2025

github-actions bot commented Apr 30, 2025 •

edited

Loading

skranee Apr 30, 2025

skranee Apr 30, 2025

skranee Apr 30, 2025

S-FrontendDev May 4, 2025

skranee Apr 30, 2025

bludnic May 1, 2025

S-FrontendDev May 4, 2025

bludnic May 1, 2025

S-FrontendDev May 4, 2025

adamantmm commented May 3, 2025

skranee May 4, 2025

bludnic May 9, 2025

bludnic May 9, 2025

S-FrontendDev May 10, 2025

adamantmm commented May 16, 2025

fix: layout fixes #782

Are you sure you want to change the base?

fix: layout fixes #782

Conversation

S-FrontendDev commented Apr 30, 2025

vercel bot commented Apr 30, 2025 • edited Loading

S-FrontendDev commented Apr 30, 2025

github-actions bot commented Apr 30, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adamantmm commented May 3, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adamantmm commented May 16, 2025

vercel bot commented Apr 30, 2025 •

edited

Loading

github-actions bot commented Apr 30, 2025 •

edited

Loading