Skip to content

Commit 89d94e4

Browse files
committed
Update TX pages for API parity
- Remove deprecated fields from UI panels - Remove TX details - Remove links to TX details in Messages view
1 parent 30b31a0 commit 89d94e4

File tree

12 files changed

+26
-349
lines changed

12 files changed

+26
-349
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "firefly-ui",
3-
"version": "0.4.4",
3+
"version": "0.4.5",
44
"private": true,
55
"dependencies": {
66
"@emotion/react": "^11.4.1",
@@ -74,4 +74,4 @@
7474
"prettier": "^2.2.1"
7575
},
7676
"proxy": "http://localhost:5000"
77-
}
77+
}

src/core/interfaces.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ export enum FFColors {
4444
Red = '#FF0000',
4545
}
4646

47+
export enum TransactionType {
48+
None = 'none',
49+
BatchPin = 'batch_pin',
50+
TokenPool = 'token_pool',
51+
TokenTransfer = 'token_transfer',
52+
}
53+
4754
export type CreatedFilterOptions = '1hour' | '24hours' | '7days' | '30days';
4855

4956
export type FilterOptions = CreatedFilterOptions;
@@ -150,18 +157,10 @@ export interface INamespace {
150157

151158
export interface ITransaction {
152159
created: number;
153-
hash: string;
154160
id: string;
155-
protocolId?: string;
156-
sequence: number;
157161
status: TXStatus;
158-
info?: IEthTransactionInfo;
159-
subject: {
160-
signer: string;
161-
namespace: string;
162-
type: string;
163-
reference: string;
164-
};
162+
namespace: string;
163+
type: TransactionType;
165164
}
166165

167166
export interface IEthTransactionInfo {

src/core/translations/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"last7Days": "Last 7 Days",
77
"last30Days": "Last 30 Days",
88
"recentTransactions": "Recent Transactions",
9-
"messages":"Messages",
9+
"messages": "Messages",
1010
"namespace": "Namespace",
1111
"transactions": "Transactions",
1212
"addFilter": "Add Filter",

src/modules/data/registration.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import { Data } from './views/Data/Data';
2929
import { Events } from './views/Events/Events';
3030
import { MessageDetails } from './views/Messages/MessageDetails';
3131
import { Messages } from './views/Messages/Messages';
32-
import { TransactionDetails } from './views/Transactions/TransactionDetails';
3332
import { Transactions } from './views/Transactions/Transactions';
3433
import { Types } from './views/Types/Types';
3534

@@ -152,11 +151,6 @@ export const DataRoutes: IRoute[] = [
152151
route: `${DATA_ROUTE_PREFIX}/transactions`,
153152
component: Transactions,
154153
},
155-
{
156-
exact: true,
157-
route: `${DATA_ROUTE_PREFIX}/transactions/:id`,
158-
component: TransactionDetails,
159-
},
160154
{
161155
exact: true,
162156
route: `${DATA_ROUTE_PREFIX}/events`,

src/modules/data/translations/en.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"filter": "Filter",
2020
"hash": "Hash",
2121
"id": "ID",
22-
"last1Hour": "Last 1 Hour",
22+
"last1Hour": "Last 1 Hour",
2323
"last24Hours": "Last 24 Hours",
2424
"last30Days": "Last 30 Days",
2525
"last7Days": "Last 7 Days",
@@ -59,4 +59,4 @@
5959
"version": "Version",
6060
"viewTx": "View TX",
6161
"yes": "Yes"
62-
}
62+
}

src/modules/data/views/Messages/MessageDetails.tsx

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
// See the License for the specific language governing permissions and
1515
// limitations under the License.
16-
import LaunchIcon from '@mui/icons-material/Launch';
1716
import {
1817
Breadcrumbs,
1918
CircularProgress,
2019
Grid,
21-
IconButton,
2220
Link,
2321
List,
2422
Modal,
@@ -126,20 +124,7 @@ export const MessageDetails: () => JSX.Element = () => {
126124
{
127125
label: t('transactionID'),
128126
value: batch?.payload.tx.id && (
129-
<>
130-
<HashPopover address={batch.payload.tx.id}></HashPopover>
131-
<IconButton
132-
className={classes.button}
133-
size="large"
134-
onClick={() => {
135-
history.push(
136-
`/namespace/${selectedNamespace}/data/transactions/${batch.payload.tx.id}`
137-
);
138-
}}
139-
>
140-
<LaunchIcon />
141-
</IconButton>
142-
</>
127+
<HashPopover address={batch.payload.tx.id}></HashPopover>
143128
),
144129
},
145130

src/modules/data/views/Transactions/TransactionDetails.tsx

Lines changed: 0 additions & 256 deletions
This file was deleted.

0 commit comments

Comments
 (0)