Merge branch 'master' into remove-goerli

ScopeLift · Jun 27, 2023 · fced06b · fced06b
2 parents 4233f33 + 26d41f9
commit fced06b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/frontend/src/components/AccountReceiveTable.vue b/frontend/src/components/AccountReceiveTable.vue
@@ -703,6 +703,7 @@ function useReceivedFundsTable(announcements: UserAnnouncement[], spendingKeyPai
     openInEtherscan,
     paginationConfig,
     privacyModalAddressWarnings,
+    provider,
     showConfirmationModal,
     showPrivacyModal,
     showWithdrawLossModal,

diff --git a/frontend/src/pages/AccountSend.vue b/frontend/src/pages/AccountSend.vue
@@ -115,25 +115,16 @@
             :disable="isSending"
             placeholder="vitalik.eth"
             lazy-rules
+            :hideBottomSpace="true"
             :rules="isValidId"
             ref="recipientIdBaseInputRef"
           />
-          <div
-            class="flex q-pt-sm text-caption warning-container"
-            v-if="recipientIdWarning"
-            :style="!recipientId || isValidRecipientId ? 'margin-top:-2em' : ''"
-          >
+          <div class="flex row text-caption warning-container q-pb-sm" v-if="recipientIdWarning">
             {{ recipientIdWarning }}
           </div>
 
           <!-- Identifier, advanced mode tooltip -->
-          <div
-            v-if="advancedMode"
-            class="row items-center text-caption q-pt-sm q-pb-lg"
-            :style="
-              !recipientId || isValidRecipientId || (!isValidRecipientId && recipientIdWarning) ? 'margin-top:-2em' : ''
-            "
-          >
+          <div v-if="advancedMode" class="row items-center text-caption q-pt-sm">
             <q-checkbox v-model="useNormalPubKey" class="col-auto" dense>
               {{ $t('Send.recipient-pkey') }}
             </q-checkbox>