Merge pull request #828 from Adamant-im/dev

S-FrontendDev · web-flow · commit 1a4486c957e9 · 2025-07-27T01:58:59.000+07:00
Fix samsung height
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "im.adamant.adamantmessengerpwa"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4103
-        versionName "4.10.3"
+        versionCode 4104
+        versionName "4.10.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adamant-im",
-  "version": "4.10.3",
+  "version": "4.10.4",
   "type": "module",
   "author": "ADAMANT Foundation <devs@adamant.im>",
   "license": "GPLv3",
diff --git a/src/App.vue b/src/App.vue
@@ -3,7 +3,7 @@
     <UploadAttachmentExitPrompt />
     <warning-on-addresses-dialog v-model="showWarningOnAddressesDialog" />
 
-    <v-main>
+    <v-main class="application--main">
       <router-view />
     </v-main>
   </v-app>
@@ -85,6 +85,14 @@ setLocale()
 <style lang="scss" scoped>
 @use '@/assets/styles/themes/adamant/_mixins.scss';
 
+.application--main {
+  flex: none;
+  position: relative;
+  height: calc(100vh - env(safe-area-inset-bottom) - env(safe-area-inset-top));
+  height: calc(100dvh - env(safe-area-inset-bottom) - env(safe-area-inset-top));
+  margin-top: env(safe-area-inset-top);
+}
+
 .v-theme--light.application--linear-gradient {
   @include mixins.linear-gradient-light();
 }
diff --git a/src/assets/styles/components/_chat.scss b/src/assets/styles/components/_chat.scss
@@ -23,16 +23,14 @@ $scroll-bar-width: 4px;
 .a-chat {
   display: block;
   text-decoration: none;
-  height: 100%; // <-- Fallback for Chrome < v108
-  // Chrome supports `dvh, lvh...` units starting with v108.
-  // See https://caniuse.com/viewport-unit-variants
-  height: calc(100dvh - var(--v-layout-bottom));
+  height: 100%;
   position: relative;
 
   @media (max-width: map.get(variables.$breakpoints, 'mobile')) {
     position: fixed;
     left: 0;
     right: 0;
+    bottom: env(safe-area-inset-bottom);
   }
 
   &__content {
diff --git a/src/components/Chat/Chat.vue b/src/components/Chat/Chat.vue
@@ -949,7 +949,7 @@ const onKeyPress = (e: KeyboardEvent) => {
   margin-right: 8px;
 }
 .chat {
-  height: calc(100vh - var(--v-layout-bottom));
+  height: 100%;
   box-shadow: none;
   background-color: transparent !important;
 }
diff --git a/src/components/Chat/Chats.vue b/src/components/Chat/Chats.vue
@@ -256,7 +256,7 @@ const loadChatsPaged = async () => {
 
   loading.value = true
   try {
-    await store.dispatch('chat/loadChatsPages')
+    await store.dispatch('chat/loadChatsPaged')
     loading.value = false
     allowRetry.value = false
   } catch (err: unknown) {
diff --git a/src/components/transactions/TransactionTemplate.vue b/src/components/transactions/TransactionTemplate.vue
@@ -369,13 +369,6 @@ const formatAmount = (amount: number, decimals = CryptosInfo[props.crypto].decim
 @use '@/assets/styles/settings/_colors.scss';
 
 .transaction-view {
-  position: relative;
-
-  &__content {
-    overflow-y: auto;
-    height: calc(100vh - var(--v-layout-bottom) - var(--toolbar-height));
-    padding-top: var(--toolbar-height);
-  }
 
   &__titlecontent {
     flex: 1 0 auto;
diff --git a/src/layouts/no-container.vue b/src/layouts/no-container.vue
@@ -2,7 +2,7 @@
   <slot />
 
   <app-snackbar />
-  <app-navigation v-if="showNavigation" />
+  <app-navigation v-if="showNavigation" absolute />
 </template>
 
 <script setup lang="ts">
diff --git a/src/layouts/toolbar.vue b/src/layouts/toolbar.vue
@@ -9,7 +9,7 @@
     <slot />
   </v-container>
   <app-snackbar />
-  <app-navigation v-if="showNavigation" />
+  <app-navigation v-if="showNavigation" absolute />
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/AppSidebar.vue b/src/views/AppSidebar.vue
@@ -222,6 +222,8 @@ onBeforeUnmount(() => {
 
   &__with-aside {
     max-width: 1512px;
+    height: 100%;
+
     @media (min-width: 1513px) {
       border-right: 2px solid black;
       border-left: 2px solid black;
@@ -231,20 +233,28 @@ onBeforeUnmount(() => {
   &__aside {
     width: var(--asideWidth);
     min-height: 100%;
-    height: calc(100vh - var(--v-layout-bottom));
+    height: calc(100% - var(--v-layout-bottom));
     border-right: 2px solid black;
     position: relative;
     max-width: 75%;
     user-select: none;
 
-    &::after {
+    @media (max-width: map.get(variables.$breakpoints, 'mobile')) {
+      border-right: none;
+    }
+
+      &::after {
       content: '';
       position: absolute;
       right: 0;
       top: 0;
       width: 10px;
       height: 100%;
       cursor: ew-resize;
+
+      @media (max-width: map.get(variables.$breakpoints, 'mobile')) {
+        content: none;
+      }
     }
 
     @media (max-width: map.get(variables.$breakpoints, 'mobile')) {
@@ -264,7 +274,7 @@ onBeforeUnmount(() => {
     flex: 1 1 auto;
     overflow-y: auto;
     overflow-x: hidden;
-    height: calc(100vh - var(--v-layout-bottom));
+    height: calc(100vh - var(--v-layout-bottom) - env(safe-area-inset-bottom) - env(safe-area-inset-top));
     width: calc(100% - var(--asideWidth));
 
     &:deep(> .v-container) {
diff --git a/src/views/SendFunds.vue b/src/views/SendFunds.vue
@@ -128,14 +128,4 @@ const onError = (message: string) => {
   })
 }
 </script>
-<style scoped lang="scss">
-.send-funds {
-  position: relative;
-
-  &__content {
-    overflow-y: auto;
-    height: calc(100vh - var(--v-layout-bottom) - var(--toolbar-height));
-    padding-top: var(--toolbar-height);
-  }
-}
-</style>
+

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "adamant-im",`
`3`		`- "version": "4.10.3",`
	`3`	`+ "version": "4.10.4",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"author": "ADAMANT Foundation <[email protected]>",`
`6`	`6`	`"license": "GPLv3",`
Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ const onKeyPress = (e: KeyboardEvent) => {`
`949`	`949`	`margin-right: 8px;`
`950`	`950`	`}`
`951`	`951`	`.chat {`
`952`		`- height: calc(100vh - var(--v-layout-bottom));`
	`952`	`+ height: 100%;`
`953`	`953`	`box-shadow: none;`
`954`	`954`	`background-color: transparent !important;`
`955`	`955`	`}`