Moved diagnostic output back to above table and made most recent mine…

…d info conditional to advanced mode
ScopeLift · Apr 22, 2024 · e9b2fe1 · e9b2fe1
1 parent 8d44cfe
commit e9b2fe1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/frontend/src/components/AccountReceiveTable.vue b/frontend/src/components/AccountReceiveTable.vue
@@ -60,6 +60,28 @@
         >.
       </div>
 
+      <div v-if="scanStatus === 'complete'" class="text-caption q-mb-sm">
+        <!-- Show the most recent timestamp and block that were scanned -->
+        {{ $t('AccountReceiveTable.most-recent-announcement') }}
+        {{ mostRecentAnnouncementBlockNumber }} /
+        {{ formatDate(mostRecentAnnouncementTimestamp * 1000) }}
+        {{ formatTime(mostRecentAnnouncementTimestamp * 1000) }}
+        <div v-if="advancedMode" class="text-caption q-mb-sm">
+          {{ $t('AccountReceiveTable.most-recent-mined') }}
+          {{ mostRecentBlockNumber }} /
+          {{ formatDate(mostRecentBlockTimestamp * 1000) }}
+          {{ formatTime(mostRecentBlockTimestamp * 1000) }}
+        </div>
+        <div v-if="advancedMode" class="text-caption q-mb-sm">
+          <!-- This scanDescriptionString describes scan settings that were used -->
+          {{ scanDescriptionString }}.
+          <span @click="context.emit('reset')" class="cursor-pointer hyperlink">{{
+            $t('AccountReceiveTable.scan-settings')
+          }}</span
+          >.
+        </div>
+      </div>
+
       <q-table
         :grid="$q.screen.xs"
         card-container-class="col q-col-gutter-md"
@@ -343,27 +365,6 @@
         </template>
       </q-table>
 
-      <div v-if="scanStatus === 'complete'" class="text-caption q-mb-sm">
-        <!-- Show the most recent timestamp and block that were scanned -->
-        {{ mostRecentAnnouncementBlockNumber }} /
-        {{ formatDate(mostRecentAnnouncementTimestamp * 1000) }}
-        {{ formatTime(mostRecentAnnouncementTimestamp * 1000) }}
-        {{ $t('AccountReceiveTable.most-recent-announcement') }}:
-        <br />
-        {{ mostRecentBlockNumber }} /
-        {{ formatDate(mostRecentBlockTimestamp * 1000) }}
-        {{ formatTime(mostRecentBlockTimestamp * 1000) }}
-        {{ $t('AccountReceiveTable.most-recent-mined') }}:
-        <div v-if="advancedMode" class="text-caption q-mb-sm">
-          <!-- This scanDescriptionString describes scan settings that were used -->
-          {{ scanDescriptionString }}.
-          <span @click="context.emit('reset')" class="cursor-pointer hyperlink">{{
-            $t('AccountReceiveTable.scan-settings')
-          }}</span
-          >.
-        </div>
-      </div>
-
       <div
         v-if="scanStatus === 'complete' && (keysMatch || (advancedMode && isCustomPrivateKey))"
         class="text-caption text-right q-mt-md"

diff --git a/frontend/src/i18n/locales/en-US.json b/frontend/src/i18n/locales/en-US.json
@@ -279,8 +279,8 @@
     "loss-warning": "It looks like you're trying to withdraw your funds to a token contract. It is very likely this is not what you intend, and proceeding will likely result in a loss of funds. Do not proceed unless you know exactly what you are doing.",
     "i-know-what": "I know what I am doing",
     "danger": "Danger",
-    "most-recent-announcement": "Most recent announcement block and timestamp",
-    "most-recent-mined": "Most recent mined block and timestamp"
+    "most-recent-announcement": "Most recent announcement block / timestamp:",
+    "most-recent-mined": "Most recent mined block / timestamp:"
   },
   "AccountReceiveTableWarning": {
     "withdrawal-warning": "You are withdrawing to {0}, which has the following warnings:",