Fix date

backend/src/database/databases.ts

@@ -36,24 +36,9 @@ export const indexerDatabase = getKysely<Indexer.ModelTypeMap>(
   config.db.readOnlyIndexer
 );
 
-export const indexerActivityDatabase = getKysely<{
-  balance_changes: {
-    block_timestamp: string;
-    receipt_id: string | null;
-    transaction_hash: string | null;
-    affected_account_id: string;
-    involved_account_id: string | null;
-    direction: "INBOUND" | "OUTBOUND";
-    cause: "VALIDATORS_REWARD" | "TRANSACTION" | "CONTRACT_REWARD" | "RECEIPT";
-    status: "FAILURE" | "SUCCESS";
-    delta_nonstaked_amount: string;
-    absolute_nonstaked_amount: string;
-    delta_staked_amount: string;
-    absolute_staked_amount: string;
-    shard_id: number;
-    index_in_chunk: number;
-  };
-}>(config.db.readOnlyIndexerActivity);
+export const indexerActivityDatabase = getKysely<any>(
+  config.db.readOnlyIndexerActivity
+);
 
 export const analyticsDatabase = getKysely<Analytics.ModelTypeMap>(
   config.db.readOnlyAnalytics

backend/src/router/transaction/get.ts

@@ -238,7 +238,7 @@ export const router = trpc
         .selectFrom("transactions")
         .select([
           "signer_account_id as signerId",
-          (eb) => div(eb, "blocks.block_timestamp", 1000 * 1000, "timestamp"),
+          (eb) => div(eb, "block_timestamp", 1000 * 1000, "timestamp"),
         ])
         .where("transaction_hash", "=", hash)
         .executeTakeFirst();

frontend/src/components/beta/transactions/InspectReceipt.tsx

@@ -4,7 +4,7 @@ import { styled } from "../../../libraries/styles";
 import * as BI from "../../../libraries/bigint";
 import { trpc } from "../../../libraries/trpc";
 
-import { Action, TransactionReceipt } from "../../../types/common";
+import { Action, RPC, TransactionReceipt } from "../../../types/common";
 import { NearAmount } from "../../utils/NearAmount";
 import Gas from "../../utils/Gas";
 import AccountLink from "../common/AccountLink";
@@ -41,6 +41,22 @@ const getDeposit = (actions: Action[]): JSBI => {
     )
     .reduce((accumulator, deposit) => JSBI.add(accumulator, deposit), BI.zero);
 };
+const getGasAttached = (actions: Action[]): JSBI => {
+  const gasAttached = actions
+    .map((action) => action.args)
+    .filter(
+      (args): args is RPC.FunctionCallActionView["FunctionCall"] =>
+        "gas" in args
+    );
+  if (gasAttached.length === 0) {
+    return BI.zero;
+  }
+  return gasAttached.reduce(
+    (accumulator, args) =>
+      JSBI.add(accumulator, JSBI.BigInt(args.gas.toString())),
+    BI.zero
+  );
+};
 
 const InspectReceipt: React.FC<Props> = React.memo(
   ({ receipt: { id, ...receipt } }) => {
@@ -53,10 +69,11 @@ const InspectReceipt: React.FC<Props> = React.memo(
       { accountId: receipt.receiverId, receiptId: id },
     ]);
 
+    const gasAttached = getGasAttached(receipt.actions);
     const refund =
       receipt.outcome.nestedReceipts
         .filter((receipt) => receipt.predecessorId === "system")
-        ?.reduce(
+        .reduce(
           (acc, receipt) => JSBI.add(acc, getDeposit(receipt.actions)),
           BI.zero
         )
@@ -92,17 +109,13 @@ const InspectReceipt: React.FC<Props> = React.memo(
         <tr>
           <TableElement>Attached Gas</TableElement>
           <TableElement>
-            {receipt.actions[0].kind === "functionCall" ? (
-              <Gas gas={JSBI.BigInt(receipt.actions[0].args.gas)} />
-            ) : (
-              "-"
-            )}
+            <Gas gas={gasAttached} />
           </TableElement>
         </tr>
         <tr>
           <TableElement>Gas Burned</TableElement>
           <TableElement>
-            <Gas gas={JSBI.BigInt(receipt.outcome.gasBurnt || 0)} />
+            <Gas gas={JSBI.BigInt(receipt.outcome.gasBurnt)} />
           </TableElement>
         </tr>
         <tr>
@@ -117,7 +130,7 @@ const InspectReceipt: React.FC<Props> = React.memo(
         <tr>
           <TableElement>Refunded</TableElement>
           <TableElement>
-            {refund ? <NearAmount amount={refund} decimalPlaces={2} /> : "0"}
+            <NearAmount amount={refund} decimalPlaces={2} />
           </TableElement>
         </tr>
         <tr>

frontend/src/components/beta/transactions/TransactionActionsList.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { useTranslation } from "react-i18next";
 import { styled } from "../../../libraries/styles";
-import Moment from "../../../libraries/moment";
+import { useFormatDistance } from "../../../hooks/use-format-distance";
 
 import { Transaction } from "../../../types/common";
 
@@ -72,13 +72,13 @@ const TransactionActionsList: React.FC<Props> = React.memo(
       [setExpandAll]
     );
     const { t } = useTranslation();
+    const formatDistance = useFormatDistance();
 
-    const start = Moment(timestamp);
-    const end = Moment(
+    const pending = formatDistance(
+      timestamp,
       receipt.outcome.nestedReceipts[receipt.outcome.nestedReceipts.length - 1]
         ?.outcome.block.timestamp
     );
-    const pending = end.from(start, true);
 
     return (
       <Container>
@@ -93,13 +93,14 @@ const TransactionActionsList: React.FC<Props> = React.memo(
               </span>
             </div>
             <Expand onClick={expandAllReceipts}>
-              Expand All
+              {t("pages.transaction.expand_all")}
               <span>+</span>
             </Expand>
           </TitleWrapper>
           <TransactionReceipt
             receipt={receipt}
             fellowOutgoingReceipts={[]}
+            className=""
             convertionReceipt={true}
             expandAll={expandAll}
           />

frontend/src/components/beta/transactions/TransactionReceipt.tsx

@@ -9,6 +9,7 @@ type Props = {
   receipt: TransactionReceipt;
   convertionReceipt: boolean;
   fellowOutgoingReceipts: TransactionReceipt[];
+  className: string;
   customCss?: React.CSSProperties;
   expandAll: boolean;
 };
@@ -23,6 +24,14 @@ const Author = styled("div", {
   position: "relative",
 });
 
+const Predecessor = styled(Author, {
+  marginBottom: 10,
+});
+
+const Receiver = styled(Author, {
+  marginTop: 10,
+});
+
 const ActionItems = styled("div", {
   display: "flex",
   flexDirection: "column",
@@ -53,6 +62,26 @@ const ReceiptWrapper = styled("div", {
       },
     },
   },
+
+  "&.lastFellowReceipt": {
+    paddingBottom: 20,
+    marginTop: 0,
+  },
+
+  "&.lastNonRefundReceipt": {
+    borderLeftColor: "transparent",
+    paddingLeft: 0,
+  },
+
+  variants: {
+    convertionReceipt: {
+      true: {
+        paddingLeft: 0,
+        borderLeftColor: "transparent",
+        marginTop: 0,
+      },
+    },
+  },
 });
 
 const Avatar = styled("div", {
@@ -73,7 +102,7 @@ const TransactionReceiptView: React.FC<Props> = React.memo(
     receipt,
     convertionReceipt,
     fellowOutgoingReceipts,
-    customCss,
+    className,
     expandAll,
   }) => {
     const [isTxTypeActive, setTxTypeActive] = React.useState(false);
@@ -84,40 +113,33 @@ const TransactionReceiptView: React.FC<Props> = React.memo(
 
     React.useEffect(() => switchActiveTxType, [expandAll]);
 
-    const remainingFellowOutgoingReceipts = [...fellowOutgoingReceipts];
-    const lastFellowOutgoingReceipt = remainingFellowOutgoingReceipts.pop();
-    const nonRefundNestedReceipts = receipt.outcome.nestedReceipts.filter(
+    const remainingFellowOutgoingReceipts = fellowOutgoingReceipts.slice(0, -1);
+    const lastFellowOutgoingReceipt = fellowOutgoingReceipts.at(-1);
+    const filterRefundNestedReceipts = receipt.outcome.nestedReceipts.filter(
       (receipt) => receipt.predecessorId !== "system"
     );
-    const lastNonRefundNestedReceipt = nonRefundNestedReceipts.pop();
+    const nonRefundNestedReceipts = filterRefundNestedReceipts.slice(0, -1);
+    const lastNonRefundNestedReceipt = filterRefundNestedReceipts.at(-1);
 
     return (
       <>
         <ReceiptWrapper
-          style={
-            convertionReceipt
-              ? {
-                  paddingLeft: 0,
-                  borderLeftColor: "transparent",
-                  marginTop: 0,
-                }
-              : {}
-          }
-          css={{ ...customCss }}
+          convertionReceipt={convertionReceipt}
+          className={className}
         >
           {convertionReceipt ? (
-            <Author css={{ marginBottom: 10 }}>
+            <Predecessor>
               <Avatar />
               <span>{receipt.predecessorId}</span>
-            </Author>
+            </Predecessor>
           ) : null}
 
           {lastFellowOutgoingReceipt ? (
             <TransactionReceiptView
               receipt={lastFellowOutgoingReceipt}
               convertionReceipt={false}
               fellowOutgoingReceipts={remainingFellowOutgoingReceipts}
-              customCss={{ paddingBottom: 20, marginTop: 0 }}
+              className="lastFellowReceipt"
               expandAll={expandAll}
             />
           ) : null}
@@ -137,20 +159,17 @@ const TransactionReceiptView: React.FC<Props> = React.memo(
             </ReceiptInfoWrapper>
           ) : null}
 
-          <Author css={{ marginTop: 10 }}>
+          <Receiver>
             <Avatar />
             <span>{receipt.receiverId}</span>
-          </Author>
+          </Receiver>
         </ReceiptWrapper>
         {lastNonRefundNestedReceipt ? (
           <TransactionReceiptView
             receipt={lastNonRefundNestedReceipt}
             convertionReceipt={false}
             fellowOutgoingReceipts={nonRefundNestedReceipts}
-            customCss={{
-              borderLeftColor: "transparent",
-              paddingLeft: 0,
-            }}
+            className="lastNonRefundReceipt"
             expandAll={expandAll}
           />
         ) : null}

frontend/src/pages/beta/transactions/[hash].tsx

@@ -9,10 +9,10 @@ import { NextPage } from "next";
 import { Transaction } from "../../../types/common";
 import { useAnalyticsTrackOnMount } from "../../../hooks/analytics/use-analytics-track-on-mount";
 
-import { trpc } from "../../../libraries/trpc";
-import { styled } from "../../../libraries/styles";
 import TransactionHeader from "../../../components/beta/transactions/TransactionHeader";
 import TransactionActionsList from "../../../components/beta/transactions/TransactionActionsList";
+import { trpc } from "../../../libraries/trpc";
+import { styled } from "../../../libraries/styles";
 
 type Props = {
   hash: string;

frontend/src/translations/en/common.json

@@ -144,6 +144,7 @@
       },
       "processed": "Processed in ${time}",
       "execution_plan": "Execution Plan",
+      "expand_all": "Expand All",
       "tabs": {
         "output": "Output",
         "inspect": "Inspect"

frontend/src/translations/ru/common.json

@@ -144,6 +144,7 @@
       },
       "processed": "Выполнено за ${time}",
       "execution_plan": "План выполнения",
+      "expand_all": "Раскрыть все",
       "tabs": {
         "output": "Итог",
         "inspect": "Обзор"

frontend/src/translations/ua/common.json

@@ -144,6 +144,7 @@
       },
       "processed": "Виконано за ${time}",
       "execution_plan": "План виконання",
+      "expand_all": "Розкрити всі",
       "tabs": {
         "output": "Підсумок",
         "inspect": "Огляд"

frontend/src/translations/vi/common.json

@@ -144,6 +144,7 @@
       },
       "processed": "Processed in ${time}",
       "execution_plan": "Execution Plan",
+      "expand_all": "Expand All",
       "tabs": {
         "output": "Output",
         "inspect": "Inspect"

frontend/src/translations/zh-hans/common.json

@@ -144,6 +144,7 @@
       },
       "processed": "Processed in ${time}",
       "execution_plan": "Execution Plan",
+      "expand_all": "Expand All",
       "tabs": {
         "output": "Output",
         "inspect": "Inspect"

frontend/src/translations/zh-hant/common.json

@@ -141,6 +141,24 @@
         "fetching": "獲取狀態...",
         "fail": "失敗",
         "success": "成功"
+      },
+      "processed": "Processed in ${time}",
+      "execution_plan": "Execution Plan",
+      "expand_all": "Expand All",
+      "tabs": {
+        "output": "Output",
+        "inspect": "Inspect"
+      },
+      "type": {
+        "transfer": "Transfer",
+        "stake": "Restake",
+        "deployContract": "Contract Deployed",
+        "addKey": "Access Key Created",
+        "deleteKey": "Access Key Deleted",
+        "functionCall": "",
+        "createAccount": "Account created",
+        "deleteAccount": "Account removed",
+        "refund": "Refund"
       }
     }
   },