Merge branch 'feature/last-swaps' into feature/swap-layout

sora-xor · Mar 7, 2024 · 7aafeb6 · 7aafeb6
2 parents 57de8da + 40e718a
commit 7aafeb6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/src/components/pages/Swap/Widget/Transactions.vue b/src/components/pages/Swap/Widget/Transactions.vue
@@ -18,7 +18,7 @@
       </s-table-column>
       <s-table-column width="76">
         <template #header>
-          <span>Time</span>
+          <span>{{ t('transaction.startTime') }}</span>
         </template>
         <template v-slot="{ row }">
           <div class="explore-table-item-date">
@@ -29,15 +29,15 @@
       </s-table-column>
       <s-table-column width="94">
         <template #header>
-          <span>Account</span>
+          <span>{{ tc('accountText', 1) }}</span>
         </template>
         <template v-slot="{ row }">
           <formatted-address :value="row.address" :symbols="8" />
         </template>
       </s-table-column>
       <s-table-column width="112" header-align="left" align="left">
         <template #header>
-          <span>Input</span>
+          <span>{{ t('transfers.from') }}</span>
         </template>
         <template v-slot="{ row }">
           <div class="explore-table-cell">
@@ -52,7 +52,7 @@
       </s-table-column>
       <s-table-column width="112" header-align="left" align="left">
         <template #header>
-          <span>Output</span>
+          <span>{{ t('transfers.to') }}</span>
         </template>
         <template v-slot="{ row }">
           <div class="explore-table-cell">
@@ -67,7 +67,7 @@
       </s-table-column>
       <s-table-column width="140" header-align="right" align="right">
         <template #header>
-          <span>Sold</span>
+          <span>{{ t('removeLiquidity.input') }}</span>
         </template>
         <template v-slot="{ row }">
           <formatted-amount
@@ -79,7 +79,7 @@
       </s-table-column>
       <s-table-column width="140" header-align="left" align="left">
         <template #header>
-          <span>Bought</span>
+          <span>{{ t('removeLiquidity.output') }}</span>
         </template>
         <template v-slot="{ row }">
           <formatted-amount

diff --git a/src/indexer/queries/orderBook.ts b/src/indexer/queries/orderBook.ts
@@ -74,7 +74,7 @@ const SubqueryOrderBooksQuery = gql<ConnectionQueryResponse<OrderBookEntity>>`
 
 const SubsquidOrderBooksQuery = gql<ConnectionQueryResponse<OrderBookEntity>>`
   query SubsquidOrderBooksQuery($after: String = null, $where: OrderBookWhereInput) {
-    data: orderBooksConnection(after: $after, where: $where) {
+    data: orderBooksConnection(orderBy: id_ASC, after: $after, where: $where) {
       pageInfo {
         hasNextPage
         endCursor

diff --git a/src/styles/_mixins.scss b/src/styles/_mixins.scss
@@ -464,14 +464,7 @@ $button-custom-shadow: -1px -1px 5px rgba(0, 0, 0, 0.05), 1px 1px 5px rgba(0, 0,
     &-cell {
       display: flex;
       align-items: center;
-
-      & + & {
-        margin-top: $inner-spacing-mini;
-      }
-
-      & > *:not(:last-child) {
-        margin-right: $inner-spacing-mini;
-      }
+      gap: $inner-spacing-mini;
     }
   }
 
@@ -535,6 +528,17 @@ $button-custom-shadow: -1px -1px 5px rgba(0, 0, 0, 0.05), 1px 1px 5px rgba(0, 0,
     th.el-table__cell.is-leaf,
     td.el-table__cell {
       border-color: var(--s-color-base-border-secondary);
+
+      &.is-right {
+        .explore-table-cell {
+          justify-content: right;
+        }
+      }
+      &.is-left {
+        .explore-table-cell {
+          justify-content: left;
+        }
+      }
     }
 
     .el-table__fixed {