Merge branch 'main' into tx-nikola-txfusion-fix-passing-contract-argu…

…ments-in-correct-order
matter-labs · Dec 4, 2024 · 7232ef9 · 7232ef9
2 parents c414da8 + 9317a70
commit 7232ef9
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/packages/app/src/components/event/ContractEvents.vue b/packages/app/src/components/event/ContractEvents.vue
@@ -159,7 +159,7 @@ watch(
     @apply block;
   }
   .pagination {
-    @apply flex justify-center p-3;
+    @apply p-3;
   }
   .only-mobile {
     @apply flex md:hidden;

diff --git a/packages/app/src/components/transactions/infoTable/GeneralInfo.vue b/packages/app/src/components/transactions/infoTable/GeneralInfo.vue
@@ -197,9 +197,9 @@
       </tr>
       <tr class="transaction-table-row">
         <table-body-column class="transaction-table-label">
-          <span class="transaction-info-field-label">{{ t("transactions.table.created") }}</span>
+          <span class="transaction-info-field-label">{{ t("transactions.table.receivedAt") }}</span>
           <InfoTooltip class="transaction-info-field-tooltip">
-            {{ t("transactions.table.createdTooltip") }}
+            {{ t("transactions.table.receivedAtTooltip") }}
           </InfoTooltip>
         </table-body-column>
         <table-body-column class="transaction-table-value">
@@ -324,7 +324,7 @@ const gasUsedPercent = computed(() => {
     @apply py-2;
   }
   .transaction-reason-value {
-    @apply text-error-600 whitespace-normal;
+    @apply text-error-600 whitespace-normal break-all;
   }
 }
 </style>
diff --git a/packages/app/src/components/transactions/infoTable/Logs.vue b/packages/app/src/components/transactions/infoTable/Logs.vue
@@ -190,7 +190,7 @@ function scrollPageToTop() {
   }
 
   .pagination {
-    @apply flex justify-center p-3;
+    @apply p-3;
   }
   .loading-row {
     .table-body-col {

diff --git a/packages/app/src/components/transfers/Table.vue b/packages/app/src/components/transfers/Table.vue
@@ -219,7 +219,7 @@ watch(
   }
 
   .pagination {
-    @apply flex justify-center p-3;
+    @apply p-3;
   }
 
   .transfer-type {

diff --git a/packages/app/src/locales/en.json b/packages/app/src/locales/en.json
@@ -105,8 +105,8 @@
             "transactionHashTooltip": "Transaction hash is a unique 66-character identifier that is generated whenever a transaction is executed",
             "nonce": "Nonce",
             "nonceTooltip": "Number of transactions sent from a sender address",
-            "created": "Created",
-            "createdTooltip": "The date and time at which a transaction is added to the block",
+            "receivedAt": "Received",
+            "receivedAtTooltip": "The date and time when the transaction was received",
             "sendersNonce": "Sender`s Nonce",
             "from": "From",
             "fromTooltip": "The sending party of the transaction",

diff --git a/packages/app/src/locales/uk.json b/packages/app/src/locales/uk.json
@@ -77,7 +77,8 @@
             "reasonTooltip": "Причина невиконання транзакції",
             "transactionHash": "Хеш Транзакції",
             "nonce": "Нонс",
-            "created": "Створено",
+            "receivedAt": "Отримано",
+            "receivedAtTooltip": "Час коли транзакцію було отримано",
             "from": "Від",
             "to": "До",
             "block": "Блок",

diff --git a/packages/app/tests/components/transactions/GeneralInfo.spec.ts b/packages/app/tests/components/transactions/GeneralInfo.spec.ts
@@ -303,7 +303,7 @@ describe("Transaction info table", () => {
     expect(gasLimitAndUsedTooltip).toBe(i18n.global.t("transactions.table.gasLimitAndUsedTooltip"));
     expect(gasPerPubdataTooltip).toBe(i18n.global.t("transactions.table.gasPerPubdataTooltip"));
     expect(nonceTooltip).toBe(i18n.global.t("transactions.table.nonceTooltip"));
-    expect(createdAtTooltip).toBe(i18n.global.t("transactions.table.createdTooltip"));
+    expect(createdAtTooltip).toBe(i18n.global.t("transactions.table.receivedAtTooltip"));
   });
   it("renders indexing transaction status", async () => {
     const wrapper = mount(Table, {

diff --git a/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature b/packages/app/tests/e2e/features/artifacts/artifactsSet1.feature
@@ -141,7 +141,7 @@ Feature: Main Page
       | Input data         | 0xa9059cbb00000000000000000000000                                  |
       | Block              | 45751                                                              |
       | Batch              | #661                                                               |
-      | Created            | 2023-02-10                                                         |
+      | Received            | 2023-02-10                                                         |
       | Tokens Transferred | 0x8f0F33583a5                                                      |
       | Tokens Transferred | From                                                               |
       | Tokens Transferred | 0x8f0F33583a5...d8f6                                               |
@@ -173,7 +173,7 @@ Feature: Main Page
       | Input data         | Function: transfer                                                 |
       | Block              | 3491940                                                            |
       | Batch              | #28739                                                             |
-      | Created            | 2023-05-14                                                         |
+      | Received            | 2023-05-14                                                         |
 
 
   @id211 @testnet