Merge pull request #777 from Adamant-im/fix/wrapper-fixes

fix: wrap SendFunds into NavigationWrapper

Author: bludnic

src/components/NavigationWrapper.vue

@@ -34,6 +34,7 @@
     </v-container>
   </div>
 </template>
+
 <script setup lang="ts">
 import AppToolbarCentered from '@/components/AppToolbarCentered.vue'
 import { computed, useSlots } from 'vue'
@@ -79,6 +80,9 @@ const title = computed(() => {
     case 'Transactions':
     case 'Transaction':
       return (route.params.txId as string) || t('transaction.transactions')
+    case 'SendFunds':
+      return t('transfer.page_title')
+
     default:
       return t('options.page_title')
   }

src/locales/de.json

@@ -232,6 +232,7 @@
     "max_transfer": "Max to transfer",
     "no_address_text": "This user does not have a public {crypto} wallet yet. To get it, he should login into messenger when his balance is more than 0.001 ADM.",
     "no_address_title": "Recipient has no {crypto} wallet yet",
+    "page_title": "Send funds",
     "send_button": "Betrag senden",
     "to_address_label": "An die Adresse",
     "to_name_label": "To {name}"

src/locales/en.json

@@ -355,6 +355,7 @@
     "no_address_title": "Recipient has no public {crypto} wallet",
     "legacy_address_text": "This user has a legacy {crypto} wallet. It will automatically update when they log in using the newest app version.",
     "legacy_address_title": "Recipient has legacy {crypto} wallet",
+    "page_title": "Send funds",
     "send_button": "Send",
     "to_address_label": "To Address",
     "to_name_label": "To {name}",

src/locales/ru.json

@@ -355,6 +355,7 @@
     "no_address_title": "У получателя нет публичного {crypto}-кошелька",
     "legacy_address_text": "У этого пользователя устаревший адрес {crypto}-кошелька. Адрес обновится автоматически, когда он войдет в аккаунт в новой версии приложения.",
     "legacy_address_title": "У получателя устаревший {crypto}-кошелек",
+    "page_title": "Отправить монеты",
     "send_button": "Отправить",
     "to_address_label": "Адрес получателя",
     "to_name_label": "Получатель: {name}",

src/locales/zh.json

@@ -344,6 +344,7 @@
     "no_address_title": "R收件人还没有 {crypto} 钱包",
     "legacy_address_text": "此用户有一个旧的 {crypto} 钱包。他们必须登录Messenger，余额超过 0.001 ADM才能更新 {crypto} 的钱包地址",
     "legacy_address_title": "收件人还有一个旧的 {crypto} 钱包",
+    "page_title": "发送资金",
     "send_button": "发送",
     "to_address_label": "收件人",
     "to_name_label": "收件人 {name}",

src/views/SendFunds.vue

@@ -1,38 +1,30 @@
 <template>
-  <div :class="className" class="w-100">
-    <app-toolbar-centered app :title="$t('home.send_btn')" flat absolute disable-max-width />
-
-    <v-container fluid class="px-0 py-0" :class="`${className}__content`">
-      <v-row justify="center" no-gutters>
-        <container padding disable-max-width>
-          <send-funds-form
-            class="pt-5"
-            :crypto-currency="cryptoCurrency"
-            :recipient-address="recipientAddress"
-            :amount-to-send="amountToSend"
-            :address-readonly="comeFromChat"
-            :reply-to-id="$route.query.replyToId"
-            @send="onSend"
-            @error="onError"
-          />
-        </container>
-      </v-row>
-    </v-container>
-  </div>
+  <navigation-wrapper :class="className">
+    <send-funds-form
+      class="pt-5"
+      :crypto-currency="cryptoCurrency"
+      :recipient-address="recipientAddress"
+      :amount-to-send="amountToSend"
+      :address-readonly="comeFromChat"
+      :reply-to-id="$route.query.replyToId"
+      @send="onSend"
+      @error="onError"
+    />
+  </navigation-wrapper>
 </template>
 
 <script>
 import validateAddress from '@/lib/validateAddress'
 import { isNumeric } from '@/lib/numericHelpers'
 
-import AppToolbarCentered from '@/components/AppToolbarCentered.vue'
 import SendFundsForm from '@/components/SendFundsForm.vue'
 import { AllCryptos } from '@/lib/constants/cryptos'
 import { vibrate } from '@/lib/vibrate'
+import NavigationWrapper from '@/components/NavigationWrapper.vue'
 
 export default {
   components: {
-    AppToolbarCentered,
+    NavigationWrapper,
     SendFundsForm
   },
   data: () => ({