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

Merge pull request #465 from sharetribe/prettier-run-missed

Browse source 
Prettier run was forgotten in previous PR
This commit is contained in:
Vesa Luusua 2017-10-05 12:37:42 +03:00 • committed by GitHub
commit 082122856a
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/OrderDetailsPanel/OrderDetailsPanel.js
View file

@ -99,10 +99,7 @@ const orderMessage = (transaction, listingTitle, providerName) => {
);
} else if (propTypes.txIsCanceled(transaction)) {
return (
<FormattedMessage
id="OrderDetailsPanel.orderCanceledStatus"
values={{ transitionDate }}
/>
<FormattedMessage id="OrderDetailsPanel.orderCanceledStatus" values={{ transitionDate }} />
);
} else if (propTypes.txIsDelivered(transaction)) {
return (

5
src/containers/InboxPage/InboxPage.js
View file

@ -224,8 +224,9 @@ export const InboxPageComponent = props => {
return isOrdersTab
? tx && tx.length > 0 && tx[0].customer.id.uuid === user.id.uuid
: tx && tx.length > 0 && tx[0].provider.id.uuid === user.id.uuid;
}
const hasTransactions = !fetchInProgress && hasOrderOrSaleTransactions(transactions, isOrders, currentUser);
};
const hasTransactions = !fetchInProgress &&
hasOrderOrSaleTransactions(transactions, isOrders, currentUser);
const pagingLinks = hasTransactions && pagination && pagination.totalPages > 1
? <PaginationLinks
className={css.pagination}

8
src/containers/InboxPage/InboxPage.test.js
View file

@ -1,7 +1,13 @@
import React from 'react';
import { RoutesProvider } from '../../components';
import { renderShallow, renderDeep } from '../../util/test-helpers';
import { fakeIntl, createCurrentUser, createUser, createTransaction, createBooking } from '../../util/test-data';
import {
fakeIntl,
createCurrentUser,
createUser,
createTransaction,
createBooking,
} from '../../util/test-data';
import { InboxPageComponent, InboxItem } from './InboxPage';
import routesConfiguration from '../../routesConfiguration';
import { flattenRoutes } from '../../util/routes';