feat: add approve type and timestamp in approve record

public/locales/en/translation.json

@@ -125,7 +125,9 @@
     "cancelled": "Cancelled",
     "executed": "Executed",
     "index": "Status",
-    "pending": "Pending"
+    "pending": "Pending",
+    "initialized": "Intialized",
+    "approvedAndExecuted": "Approved And Executed"
   },
   "save": "Save",
   "add": "Add",

public/locales/zh/translation.json

@@ -124,7 +124,9 @@
     "cancelled": "已取消",
     "executed": "已执行",
     "index": "状态",
-    "pending": "等待批准"
+    "pending": "等待批准",
+    "initialized": "已发起",
+    "approvedAndExecuted": "批准并执行"
   },
   "save": "保存",
   "add": "添加",

src/components/Entries.tsx

@@ -9,7 +9,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import { APPROVE_RECORD_QUERY } from '../config';
 import { useApi, useIsInjected } from '../hooks';
 import { AddressPair, Entry, Network, TxActionType } from '../model';
-import { toShortString } from '../utils';
+import { toShortString, formatDate } from '../utils';
 import { ArgObj, Args } from './Args';
 import { genExpandIcon } from './expandIcon';
 import { MemberList } from './Members';
@@ -26,6 +26,8 @@ interface ApproveRecord {
   multisigRecordId: string;
   account: string;
   approveTimepoint: string;
+  approveTimestamp: string;
+  approveType: string;
 }
 
 export interface EntriesProps {
@@ -88,31 +90,61 @@ function MemberStatus(props: { entry: Entry; pair: KeyringJson; isInProgress: bo
       height: matchedApproveRecord.approveTimepoint.split('-')[0],
       index: matchedApproveRecord.approveTimepoint.split('-')[1],
     };
+
+    const approveTypeTrans =
+      matchedApproveRecord.approveType === 'initialize'
+        ? 'status.initialized'
+        : matchedApproveRecord.approveType === 'execute'
+        ? 'status.approvedAndExecuted'
+        : 'status.approved';
+
+    return (
+      <>
+        <div className="flex items-center">
+          <Trans>{approveTypeTrans}</Trans> (
+          <SubscanLink extrinsic={approveTimepoint}>{matchedApproveRecord.approveTimepoint}</SubscanLink>)
+        </div>
+        <div className="text-xs scale-90 origin-left">{formatDate(matchedApproveRecord.approveTimestamp)}</div>
+      </>
+    );
+  }
+
+  if (!approved) {
+    return <div>-</div>;
+  }
+
+  const matched = inProgressApproveRecords?.approveRecords.nodes.find((item) => item.account === address);
+
+  if (!matched) {
     return (
       <div className="flex items-center">
-        <Trans>status.approved</Trans> (
-        <SubscanLink extrinsic={approveTimepoint}>{matchedApproveRecord.approveTimepoint}</SubscanLink>)
+        <Trans>status.approved</Trans>
       </div>
     );
   }
 
-  const matched = inProgressApproveRecords?.approveRecords.nodes.find((item) => item.account === address);
   const inProgressApproveTimepoint = {
-    height: matched?.approveTimepoint.split('-')[0] || '',
-    index: matched?.approveTimepoint.split('-')[1] || '',
+    height: matched.approveTimepoint.split('-')[0] || '',
+    index: matched.approveTimepoint.split('-')[1] || '',
   };
 
-  return approved ? (
-    <div className="flex items-center">
-      <Trans>status.approved</Trans>
-      {matched && (
+  const approveTypeTrans =
+    matched.approveType === 'initialize'
+      ? 'status.initialized'
+      : matched.approveType === 'execute'
+      ? 'status.approvedAndExecuted'
+      : 'status.approved';
+
+  return (
+    <>
+      <div className="flex items-center">
+        <Trans>{approveTypeTrans}</Trans>
         <div>
           (<SubscanLink extrinsic={inProgressApproveTimepoint}>{matched.approveTimepoint}</SubscanLink>)
         </div>
-      )}
-    </div>
-  ) : (
-    <div>-</div>
+      </div>
+      <div className="text-xs scale-90 origin-left">{formatDate(matched.approveTimestamp)}</div>
+    </>
   );
 }
 

src/components/ExtrinsicRecords.tsx

@@ -42,6 +42,8 @@ interface MultisigRecord {
 export interface ApproveRecord {
   account: string;
   approveTimepoint: string;
+  approveTimestamp: string;
+  approveType: string;
 }
 
 const { TabPane } = Tabs;

src/config/chains/crab.json

@@ -3,7 +3,7 @@
   "displayName": "Crab",
   "rpc": "wss://crab-rpc.darwinia.network",
   "api": {
-    "subql": "https://api.subquery.network/sq/itering/multisig_crab"
+    "subql": "https://api.subquery.network/sq/itering/multisig_crab__aXRlc"
   },
   "logo": "/image/crab-button-mobile.png",
   "explorerHostName": "crab",

src/config/chains/darwinia.json

@@ -3,7 +3,7 @@
   "displayName": "Darwinia",
   "rpc": "wss://rpc.darwinia.network",
   "api": {
-    "subql": "https://api.subquery.network/sq/itering/multisig_darwinia"
+    "subql": "https://api.subquery.network/sq/itering/multisig_darwinia__aXRlc"
   },
   "logo": "/image/darwinia-button-mobile.png",
   "explorerHostName": "darwinia",

src/config/chains/kusama.json

@@ -3,7 +3,7 @@
   "displayName": "Kusama",
   "rpc": "wss://kusama.api.onfinality.io/public-ws",
   "api": {
-    "subql": "https://api.subquery.network/sq/itering/multisig_ksm"
+    "subql": "https://api.subquery.network/sq/itering/multisig_ksm__aXRlc"
   },
   "logo": "/image/kusama-button-mobile.png",
   "explorerHostName": "kusama",

src/config/chains/pangolin.json

@@ -4,7 +4,7 @@
   "isTestnet": true,
   "rpc": "wss://pangolin-rpc.darwinia.network/",
   "api": {
-    "subql": "https://api.subquery.network/sq/itering/multisig_pangolin"
+    "subql": "https://api.subquery.network/sq/itering/multisig_pangolin__aXRlc"
   },
   "logo": "/image/pangolin-button-mobile.png",
   "explorerHostName": "pangolin",

src/config/chains/polkadot.json

@@ -3,7 +3,7 @@
   "displayName": "Polkadot",
   "rpc": "wss://rpc.polkadot.io",
   "api": {
-    "subql": "https://api.subquery.network/sq/itering/multisig_polkadot"
+    "subql": "https://api.subquery.network/sq/itering/multisig_polkadot__aXRlc"
   },
   "logo": "/image/polkadot-button-mobile.png",
   "explorerHostName": "polkadot",

src/config/query.ts

@@ -30,6 +30,8 @@ export const MULTISIG_RECORD_QUERY = `
           nodes {
             account
             approveTimepoint
+            approveTimestamp
+            approveType
           }
         }
 
@@ -73,6 +75,8 @@ query approveRecords($multisigRecordId: String!) {
       multisigRecordId
       account
       approveTimepoint
+      approveTimestamp
+      approveType
     }
   }
 }

src/utils/helper/index.ts

@@ -7,3 +7,4 @@ export * from './multisig';
 export * from './types';
 export * from './url';
 export * from './validate';
+export * from './time';

src/utils/helper/time.ts

@@ -0,0 +1,3 @@
+export function formatDate(millis: string | number): string {
+  return new Date(Number(millis)).toUTCString();
+}