maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-28 20:53:24 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #865 from sharetribe/tx-duck-clear-state

Browse source 
Change clearErrors action to resetState
This commit is contained in:
Hannu Lyytikäinen 2018-07-10 13:37:26 +03:00 • committed by GitHub
commit 8925b1bd3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -14,7 +14,9 @@ way to update this template, but currently, we follow a pattern:
## Upcoming version
* [fix] Fix submit button state on contact details page
* [fix] Fix TransactionPage state management in loadData.
[#863](https://github.com/sharetribe/flex-template-web/pull/863) & [#865](https://github.com/sharetribe/flex-template-web/pull/865)
* [fix] Fix submit button state on contact details page.
[#864](https://github.com/sharetribe/flex-template-web/pull/864)
* [fix] Fix passing initial message sending error to transaction page.
[#863](https://github.com/sharetribe/flex-template-web/pull/863)

10
src/containers/TransactionPage/TransactionPage.duck.js
View file

@ -27,7 +27,7 @@ const CUSTOMER = 'customer';
export const SET_INITAL_VALUES = 'app/TransactionPage/SET_INITIAL_VALUES';
export const CLEAR_ERRORS = 'app/TransactionPage/CLEAR_ERRORS';
export const RESET_STATE = 'app/TransactionPage/RESET_STATE';
export const FETCH_TRANSACTION_REQUEST = 'app/TransactionPage/FETCH_TRANSACTION_REQUEST';
export const FETCH_TRANSACTION_SUCCESS = 'app/TransactionPage/FETCH_TRANSACTION_SUCCESS';
@ -91,8 +91,8 @@ export default function checkoutPageReducer(state = initialState, action = {}) {
case SET_INITAL_VALUES:
return { ...initialState, ...payload };
case CLEAR_ERRORS:
return { ...state, sendMessageError: null, sendReviewError: null };
case RESET_STATE:
return { ...state, sendMessageError: null, sendReviewError: null, messages: [] };
case FETCH_TRANSACTION_REQUEST:
return { ...state, fetchTransactionInProgress: true, fetchTransactionError: null };
@ -174,7 +174,7 @@ export const setInitialValues = initialValues => ({
});
// clears tx page message and review sending errors
const clearErrors = () => ({ type: CLEAR_ERRORS });
const resetState = () => ({ type: RESET_STATE });
const fetchTransactionRequest = () => ({ type: FETCH_TRANSACTION_REQUEST });
const fetchTransactionSuccess = response => ({
@ -483,7 +483,7 @@ export const loadData = params => dispatch => {
const txId = new UUID(params.id);
// Clear the send error since the message form is emptied as well.
dispatch(clearErrors());
dispatch(resetState());
// Sale / order (i.e. transaction entity in API)
return Promise.all([dispatch(fetchTransaction(txId)), dispatch(fetchMessages(txId, 1))]);