Merge branch 'release-candidate-0.74.0' of https://github.com/liquali…

…ty/wallet into ext-35-whats-new-facelift
liquality · Sep 28, 2022 · 74c242a · 74c242a
1 parent 09b638a
commit 74c242a
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 16 deletions.
diff --git a/src/components/AccountTooltip.vue b/src/components/AccountTooltip.vue
@@ -13,7 +13,8 @@
             {{ address ? shortenAddress(address) : '' }}
           </p>
           <p class="text-muted my-0 text-left" v-if="isChainEvmCompatible(asset)">
-            {{ $t('components.accountTooltip.availableGas') }} {{ nativeAssetBalance }} {{ nativeAsset }}
+            {{ $t('components.accountTooltip.availableGas') }} {{ nativeAssetBalance }}
+            {{ nativeAsset }}
           </p>
         </div>
       </div>

diff --git a/src/components/CustomFeesEIP1559.vue b/src/components/CustomFeesEIP1559.vue
@@ -81,9 +81,8 @@
         <div class="custom-fee-inputs">
           <div class="input-wrapper">
             <p>
-              <strong>
-                {{ $t('components.customFees.minerTip') }}
-              </strong>{{ ' ' + $t('components.customFees.toSpeedUp') }}
+              <strong> {{ $t('components.customFees.minerTip') }} </strong
+              >{{ ' ' + $t('components.customFees.toSpeedUp') }}
             </p>
             <span>${{ minerTipFiat }}</span>
             <div class="custom-fee-details-item">
@@ -114,7 +113,8 @@
             <p>
               <strong>
                 {{ $t('components.customFees.maxFee') }}
-              </strong> {{ $t('components.customFees.perGas') }}
+              </strong>
+              {{ $t('components.customFees.perGas') }}
             </p>
             <span>${{ maxFiat }}</span>
             <div class="custom-fee-details-item">
@@ -202,15 +202,15 @@
             id="custom_fee_cancel_button"
             @click="cancel"
           >
-          {{ $t('common.cancel') }}
+            {{ $t('common.cancel') }}
           </button>
           <button
             class="btn btn-primary btn-lg btn-block"
             id="custom_fee_apply_button"
             @click="apply"
             :disabled="!tipFee || !maxFee"
           >
-          {{ $t('common.apply') }}
+            {{ $t('common.apply') }}
           </button>
         </div>
       </div>

diff --git a/src/components/NFT/NFTAssets.vue b/src/components/NFT/NFTAssets.vue
@@ -19,7 +19,8 @@
                 isAccount: isAccount,
                 chain: chain
               }
-            }">
+            }"
+          >
             {{ $t('components.nft.seeAll') }}
           </router-link>
         </span>

diff --git a/src/swaps/views/Timeline.vue b/src/swaps/views/Timeline.vue
@@ -71,7 +71,7 @@
                       v-if="!feeSelectorLoading"
                       @click="closeFeeSelector()"
                     >
-                    {{ $t('common.cancel') }}
+                      {{ $t('common.cancel') }}
                     </button>
                     <button
                       class="btn btn-sm btn-primary btn-icon"

diff --git a/src/views/Details/SwapDetails.vue b/src/views/Details/SwapDetails.vue
@@ -16,7 +16,7 @@
               v-if="item.error"
               @click="retry"
             >
-            {{ $t('pages.details.retry') }}
+              {{ $t('pages.details.retry') }}
             </button>
             <CompletedIcon v-else-if="item.status === 'SUCCESS'" class="swap-details_status-icon" />
             <RefundedIcon

diff --git a/src/views/Details/TransactionDetails.vue b/src/views/Details/TransactionDetails.vue
@@ -40,7 +40,7 @@
             </p>
             <p id="transaction_detail_sent_amount_today">
               ${{
-                prettyFiatBalance(prettyBalance(item.amount, item.from), fiatRates[item.from]) 
+                prettyFiatBalance(prettyBalance(item.amount, item.from), fiatRates[item.from])
               }}
               / {{ $t('pages.details.today') }}
             </p>

diff --git a/src/views/Experiments.vue b/src/views/Experiments.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="view-container">
-    <NavBar :showMenu="true" :showBack="true" backPath="/settings" :backLabel="$t('pages.settings.settings')">
+    <NavBar
+      :showMenu="true"
+      :showBack="true"
+      backPath="/settings"
+      :backLabel="$t('pages.settings.settings')"
+    >
       <span class="wallet_header">
         <strong>
           {{ $t('pages.experiments.experiments') }}

diff --git a/src/views/Onboarding/SeedPhrase/PhraseReveal.vue b/src/views/Onboarding/SeedPhrase/PhraseReveal.vue
@@ -41,7 +41,7 @@ export default {
   computed: {
     ...mapState(['wallets', 'activeWalletId']),
     wallet: function () {
-      return this.wallets.find(wallet => wallet.id === this.activeWalletId)
+      return this.wallets.find((wallet) => wallet.id === this.activeWalletId)
     },
     seedList: function () {
       return this.wallet.mnemonic.split(' ')

diff --git a/src/views/PermissionSend.vue b/src/views/PermissionSend.vue
@@ -12,7 +12,9 @@
           </p>
         </div>
         <div class="form-group">
-          <label v-if="feeInUsdValue">{{ $t('common.transactionFee') }} {{ feeInUsdValue }} USD</label>
+          <label v-if="feeInUsdValue"
+            >{{ $t('common.transactionFee') }} {{ feeInUsdValue }} USD</label
+          >
         </div>
       </div>
 

diff --git a/src/views/Send/SendNFT.vue b/src/views/Send/SendNFT.vue
@@ -57,7 +57,7 @@
           @click="next('selectedAsset')"
           :disabled="!selectedNFT"
         >
-        {{ $t('common.next') }}
+          {{ $t('common.next') }}
         </button>
       </div>
     </template>
@@ -184,7 +184,7 @@
               @click="next('review')"
               :disabled="!canSend"
             >
-            {{ $t('common.review') }}
+              {{ $t('common.review') }}
             </button>
           </div>
         </div>