mirror of
https://github.com/trezor/trezor-wallet
synced 2024-12-29 02:18:06 +00:00
save sendForm state
This commit is contained in:
parent
1d59046123
commit
692e7788fd
@ -55,8 +55,10 @@ export const update = (initAccountAction: () => ThunkAction): ThunkAction => {
|
||||
abstractAccount,
|
||||
router
|
||||
} = getState();
|
||||
const isLocationChanged: boolean = (!abstractAccount || router.location.pathname !== abstractAccount.location);
|
||||
if (isLocationChanged) {
|
||||
|
||||
const shouldReload: boolean = (!abstractAccount || router.location.pathname !== abstractAccount.location);
|
||||
if (shouldReload) {
|
||||
dispatch( dispose() );
|
||||
dispatch( init() );
|
||||
if (abstractAccount !== null)
|
||||
initAccountAction();
|
||||
|
@ -93,7 +93,20 @@ export type SendFormAction = SendTxAction | {
|
||||
type: typeof SEND.SEND,
|
||||
} | {
|
||||
type: typeof SEND.TX_ERROR,
|
||||
};
|
||||
} | {
|
||||
type: typeof SEND.FROM_SESSION_STORAGE,
|
||||
address: string,
|
||||
amount: string,
|
||||
setMax: boolean,
|
||||
selectedCurrency: string,
|
||||
selectedFeeLevel: any,
|
||||
advanced: boolean,
|
||||
gasLimit: string,
|
||||
gasPrice: string,
|
||||
data: string,
|
||||
nonce: string,
|
||||
touched: any,
|
||||
}
|
||||
|
||||
//const numberRegExp = new RegExp('^([0-9]{0,10}\\.)?[0-9]{1,18}$');
|
||||
const numberRegExp: RegExp = new RegExp('^(0|0\\.([0-9]+)?|[1-9][0-9]*\\.?([0-9]+)?|\\.[0-9]+)$');
|
||||
|
@ -17,4 +17,6 @@ export const DATA_CHANGE: 'send__data_change' = 'send__data_change';
|
||||
export const SEND: 'send__submit' = 'send__submit';
|
||||
export const TX_COMPLETE: 'send__tx_complete' = 'send__tx_complete';
|
||||
export const TX_ERROR: 'send__tx_error' = 'send__tx_error';
|
||||
export const TOGGLE_ADVANCED: 'send__toggle_advanced' = 'send__toggle_advanced';
|
||||
export const TOGGLE_ADVANCED: 'send__toggle_advanced' = 'send__toggle_advanced';
|
||||
|
||||
export const FROM_SESSION_STORAGE: 'send__from_session_storage' = 'send__from_session_storage';
|
@ -202,6 +202,25 @@ export default (state: State = initialState, action: Action): State => {
|
||||
infos: action.infos,
|
||||
}
|
||||
|
||||
case SEND.FROM_SESSION_STORAGE :
|
||||
return {
|
||||
...state,
|
||||
|
||||
address: action.address,
|
||||
amount: action.amount,
|
||||
setMax: action.setMax,
|
||||
selectedCurrency: action.selectedCurrency,
|
||||
selectedFeeLevel: action.selectedFeeLevel,
|
||||
advanced: action.advanced,
|
||||
gasLimit: action.gasLimit,
|
||||
gasPrice: action.gasPrice,
|
||||
data: action.data,
|
||||
nonce: action.nonce,
|
||||
untouched: false,
|
||||
touched: action.touched,
|
||||
|
||||
}
|
||||
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
|
145
src/js/services/SessionStorageService.js
Normal file
145
src/js/services/SessionStorageService.js
Normal file
@ -0,0 +1,145 @@
|
||||
/* @flow */
|
||||
'use strict';
|
||||
|
||||
import * as LocalStorageActions from '../actions/LocalStorageActions';
|
||||
import * as SendFormActions from '../actions/SendFormActions';
|
||||
|
||||
import { DEVICE } from 'trezor-connect';
|
||||
import * as CONNECT from '../actions/constants/TrezorConnect';
|
||||
import * as MODAL from '../actions/constants/modal';
|
||||
import * as TOKEN from '../actions/constants/token';
|
||||
import * as ACCOUNT from '../actions/constants/account';
|
||||
import * as DISCOVERY from '../actions/constants/discovery';
|
||||
import * as SEND from '../actions/constants/send';
|
||||
import * as WEB3 from '../actions/constants/web3';
|
||||
import * as PENDING from '../actions/constants/pendingTx';
|
||||
import { LOCATION_CHANGE } from 'react-router-redux';
|
||||
import { findAccountTokens } from '../reducers/TokensReducer';
|
||||
|
||||
import type {
|
||||
Middleware,
|
||||
MiddlewareAPI,
|
||||
MiddlewareDispatch,
|
||||
State,
|
||||
Dispatch,
|
||||
Action,
|
||||
AsyncAction,
|
||||
GetState
|
||||
} from '../flowtype';
|
||||
|
||||
import type { TrezorDevice } from '../flowtype';
|
||||
import type { Account } from '../reducers/AccountsReducer';
|
||||
import type { Token } from '../reducers/TokensReducer';
|
||||
import type { PendingTx } from '../reducers/PendingTxReducer';
|
||||
import type { Discovery } from '../reducers/DiscoveryReducer';
|
||||
|
||||
|
||||
const save = (dispatch: Dispatch, getState: GetState): void => {
|
||||
|
||||
if (typeof window.sessionStorage === 'undefined') return;
|
||||
|
||||
const accountState = getState().abstractAccount;
|
||||
const sendState = getState().sendForm;
|
||||
if (accountState && !sendState.untouched) {
|
||||
const value = {
|
||||
address: sendState.address,
|
||||
amount: sendState.amount,
|
||||
setMax: sendState.setMax,
|
||||
selectedCurrency: sendState.selectedCurrency,
|
||||
selectedFeeLevel: sendState.selectedFeeLevel,
|
||||
advanced: sendState.advanced,
|
||||
gasLimit: sendState.gasLimit,
|
||||
gasPrice: sendState.gasPrice,
|
||||
data: sendState.data,
|
||||
nonce: sendState.nonce,
|
||||
touched: sendState.touched
|
||||
}
|
||||
|
||||
try {
|
||||
window.sessionStorage.setItem(`SEND:${accountState.location}`, JSON.stringify(value) );
|
||||
} catch (error) {
|
||||
console.error("Saving sessionStorage error: " + error)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
const load = (dispatch: Dispatch, getState: GetState): void => {
|
||||
|
||||
if (typeof window.localStorage === 'undefined') return;
|
||||
|
||||
const accountState = getState().abstractAccount;
|
||||
const sendState = getState().sendForm;
|
||||
|
||||
if (accountState) {
|
||||
try {
|
||||
const key: string = `SEND:${accountState.location}`;
|
||||
const value: string = window.sessionStorage.getItem(key);
|
||||
const json = JSON.parse(value);
|
||||
|
||||
if (json) {
|
||||
|
||||
// check if this token still exists in user tokens list
|
||||
if (json.selectedCurrency !== sendState.coinSymbol) {
|
||||
const token = getState().tokens.find(t => t.symbol === json.selectedCurrency);
|
||||
if (!token) {
|
||||
window.sessionStorage.removeItem(key);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
dispatch({
|
||||
type: SEND.FROM_SESSION_STORAGE,
|
||||
address: json.address,
|
||||
amount: json.amount,
|
||||
setMax: false,
|
||||
selectedCurrency: json.selectedCurrency,
|
||||
selectedFeeLevel: json.selectedFeeLevel,
|
||||
advanced: json.advanced,
|
||||
gasLimit: json.gasLimit,
|
||||
gasPrice: json.gasPrice,
|
||||
data: json.data,
|
||||
nonce: json.nonce,
|
||||
touched: json.touched,
|
||||
});
|
||||
|
||||
if (json.setMax) {
|
||||
dispatch(SendFormActions.onSetMax());
|
||||
} else {
|
||||
dispatch(SendFormActions.validation());
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Loading sessionStorage error: " + error)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const LocalStorageService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispatch) => (action: Action): Action => {
|
||||
|
||||
if (action.type === ACCOUNT.DISPOSE) {
|
||||
// if (action.type === SEND.DISPOSE) {
|
||||
// save fields before dispose action
|
||||
save(api.dispatch, api.getState);
|
||||
}
|
||||
|
||||
next(action);
|
||||
|
||||
|
||||
switch (action.type) {
|
||||
|
||||
// load fields after action
|
||||
case SEND.INIT :
|
||||
load(api.dispatch, api.getState);
|
||||
break;
|
||||
}
|
||||
|
||||
return action;
|
||||
};
|
||||
|
||||
export default LocalStorageService;
|
@ -4,6 +4,7 @@
|
||||
import LogService from './LogService';
|
||||
import RouterService from './RouterService';
|
||||
import LocalStorageService from './LocalStorageService';
|
||||
import SessionStorageService from './SessionStorageService';
|
||||
import CoinmarketcapService from './CoinmarketcapService';
|
||||
import TrezorConnectService from './TrezorConnectService';
|
||||
|
||||
@ -11,6 +12,7 @@ export default [
|
||||
LogService,
|
||||
RouterService,
|
||||
LocalStorageService,
|
||||
SessionStorageService,
|
||||
TrezorConnectService,
|
||||
CoinmarketcapService,
|
||||
];
|
Loading…
Reference in New Issue
Block a user