Merge pull request #176 from eqlabs/feat/json-transactions
Json transactions
This commit is contained in:
23
state/actions/showAlert.ts
Normal file
23
state/actions/showAlert.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import { ref } from 'valtio';
|
||||
import { AlertState, alertState } from "../../components/AlertDialog";
|
||||
|
||||
export const showAlert = (title: string, opts: Omit<Partial<AlertState>, 'title' | 'isOpen'> = {}) => {
|
||||
const { body: _body, confirmPrefix: _confirmPrefix, ...rest } = opts
|
||||
const body = (_body && typeof _body === 'object') ? ref(_body) : _body
|
||||
const confirmPrefix = (_confirmPrefix && typeof _confirmPrefix === 'object') ? ref(_confirmPrefix) : _confirmPrefix
|
||||
|
||||
const nwState: AlertState = {
|
||||
isOpen: true,
|
||||
title,
|
||||
body,
|
||||
confirmPrefix,
|
||||
cancelText: undefined,
|
||||
confirmText: undefined,
|
||||
onCancel: undefined,
|
||||
onConfirm: undefined,
|
||||
...rest,
|
||||
}
|
||||
Object.entries(nwState).forEach(([key, value]) => {
|
||||
(alertState as any)[key] = value
|
||||
})
|
||||
}
|
||||
@@ -1,6 +1,32 @@
|
||||
import { proxy } from 'valtio';
|
||||
import { TransactionState } from '../components/Transaction';
|
||||
import { deepEqual } from '../utils/object';
|
||||
import transactionsData from "../content/transactions.json";
|
||||
import state from '.';
|
||||
import { showAlert } from "../state/actions/showAlert";
|
||||
import { parseJSON } from '../utils/json';
|
||||
|
||||
export type SelectOption = {
|
||||
value: string;
|
||||
label: string;
|
||||
};
|
||||
|
||||
export interface TransactionState {
|
||||
selectedTransaction: SelectOption | null;
|
||||
selectedAccount: SelectOption | null;
|
||||
selectedDestAccount: SelectOption | null;
|
||||
txIsLoading: boolean;
|
||||
txIsDisabled: boolean;
|
||||
txFields: TxFields;
|
||||
viewType: 'json' | 'ui',
|
||||
editorSavedValue: null | string,
|
||||
editorValue?: string
|
||||
}
|
||||
|
||||
|
||||
export type TxFields = Omit<
|
||||
typeof transactionsData[0],
|
||||
"Account" | "Sequence" | "TransactionType"
|
||||
>;
|
||||
|
||||
export const defaultTransaction: TransactionState = {
|
||||
selectedTransaction: null,
|
||||
@@ -9,6 +35,8 @@ export const defaultTransaction: TransactionState = {
|
||||
txIsLoading: false,
|
||||
txIsDisabled: false,
|
||||
txFields: {},
|
||||
viewType: 'ui',
|
||||
editorSavedValue: null
|
||||
};
|
||||
|
||||
export const transactionsState = proxy({
|
||||
@@ -24,11 +52,13 @@ export const transactionsState = proxy({
|
||||
/**
|
||||
* Simple transaction state changer
|
||||
* @param header Unique key and tab name for the transaction tab
|
||||
* @param partialTx partial transaction state, `{}` resets the state and `undefined` deletes the transaction
|
||||
* @param partialTx partial transaction state, `undefined` deletes the transaction
|
||||
*
|
||||
*/
|
||||
export const modifyTransaction = (
|
||||
header: string,
|
||||
partialTx?: Partial<TransactionState>
|
||||
partialTx?: Partial<TransactionState>,
|
||||
opts: { replaceState?: boolean } = {}
|
||||
) => {
|
||||
const tx = transactionsState.transactions.find(tx => tx.header === header);
|
||||
|
||||
@@ -40,14 +70,24 @@ export const modifyTransaction = (
|
||||
}
|
||||
|
||||
if (!tx) {
|
||||
const state = {
|
||||
...defaultTransaction,
|
||||
...partialTx,
|
||||
}
|
||||
transactionsState.transactions.push({
|
||||
header,
|
||||
state: {
|
||||
...defaultTransaction,
|
||||
...partialTx,
|
||||
},
|
||||
state,
|
||||
});
|
||||
return;
|
||||
return state;
|
||||
}
|
||||
|
||||
if (opts.replaceState) {
|
||||
const repTx: TransactionState = {
|
||||
...defaultTransaction,
|
||||
...partialTx,
|
||||
}
|
||||
tx.state = repTx
|
||||
return repTx
|
||||
}
|
||||
|
||||
Object.keys(partialTx).forEach(k => {
|
||||
@@ -56,4 +96,130 @@ export const modifyTransaction = (
|
||||
const p = partialTx as any;
|
||||
if (!deepEqual(s[k], p[k])) s[k] = p[k];
|
||||
});
|
||||
};
|
||||
|
||||
return tx.state
|
||||
};
|
||||
|
||||
// state to tx options
|
||||
export const prepareTransaction = (data: any) => {
|
||||
let options = { ...data };
|
||||
|
||||
(Object.keys(options)).forEach(field => {
|
||||
let _value = options[field];
|
||||
// convert xrp
|
||||
if (_value && typeof _value === "object" && _value.$type === "xrp") {
|
||||
if (+_value.$value) {
|
||||
options[field] = (+_value.$value * 1000000 + "") as any;
|
||||
} else {
|
||||
options[field] = undefined; // 👇 💀
|
||||
}
|
||||
}
|
||||
// handle type: `json`
|
||||
if (_value && typeof _value === "object" && _value.$type === "json") {
|
||||
if (typeof _value.$value === "object") {
|
||||
options[field] = _value.$value as any;
|
||||
} else {
|
||||
try {
|
||||
options[field] = JSON.parse(_value.$value);
|
||||
} catch (error) {
|
||||
const message = `Input error for json field '${field}': ${error instanceof Error ? error.message : ""
|
||||
}`;
|
||||
console.error(message)
|
||||
options[field] = _value.$value
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// delete unneccesary fields
|
||||
if (options[field] === undefined) {
|
||||
delete options[field];
|
||||
}
|
||||
});
|
||||
|
||||
return options
|
||||
}
|
||||
|
||||
// editor value to state
|
||||
export const prepareState = (value: string, txState: TransactionState) => {
|
||||
const options = parseJSON(value);
|
||||
if (!options) {
|
||||
showAlert("Error!", {
|
||||
body: "Cannot save editor with malformed transaction."
|
||||
})
|
||||
return
|
||||
};
|
||||
|
||||
const { Account, TransactionType, Destination, ...rest } = options;
|
||||
let tx: Partial<TransactionState> = {};
|
||||
const { txFields } = txState
|
||||
|
||||
if (Account) {
|
||||
const acc = state.accounts.find(acc => acc.address === Account);
|
||||
if (acc) {
|
||||
tx.selectedAccount = {
|
||||
label: acc.name,
|
||||
value: acc.address,
|
||||
};
|
||||
} else {
|
||||
tx.selectedAccount = {
|
||||
label: Account,
|
||||
value: Account,
|
||||
};
|
||||
}
|
||||
} else {
|
||||
tx.selectedAccount = null;
|
||||
}
|
||||
|
||||
if (TransactionType) {
|
||||
tx.selectedTransaction = {
|
||||
label: TransactionType,
|
||||
value: TransactionType,
|
||||
};
|
||||
} else {
|
||||
tx.selectedTransaction = null;
|
||||
}
|
||||
|
||||
if (txFields.Destination !== undefined) {
|
||||
const dest = state.accounts.find(acc => acc.address === Destination);
|
||||
rest.Destination = null
|
||||
if (dest) {
|
||||
tx.selectedDestAccount = {
|
||||
label: dest.name,
|
||||
value: dest.address,
|
||||
};
|
||||
}
|
||||
else if (Destination) {
|
||||
tx.selectedDestAccount = {
|
||||
label: Destination,
|
||||
value: Destination,
|
||||
};
|
||||
}
|
||||
else {
|
||||
tx.selectedDestAccount = null
|
||||
}
|
||||
}
|
||||
|
||||
Object.keys(rest).forEach(field => {
|
||||
const value = rest[field];
|
||||
const origValue = txFields[field as keyof TxFields]
|
||||
const isXrp = typeof value !== 'object' && origValue && typeof origValue === 'object' && origValue.$type === 'xrp'
|
||||
if (isXrp) {
|
||||
rest[field] = {
|
||||
$type: "xrp",
|
||||
$value: +value / 1000000, // TODO maybe use bigint?
|
||||
};
|
||||
} else if (typeof value === "object") {
|
||||
rest[field] = {
|
||||
$type: "json",
|
||||
$value: value,
|
||||
};
|
||||
}
|
||||
});
|
||||
|
||||
tx.txFields = rest;
|
||||
tx.editorSavedValue = null;
|
||||
|
||||
return tx
|
||||
}
|
||||
|
||||
export { transactionsData }
|
||||
|
||||
Reference in New Issue
Block a user