Merge pull request #2036 from TiagoKaska/master
#1772 - add Reverse Order & Use System/Location Time/Date
This commit is contained in:
commit
b8679008e1
3 changed files with 11 additions and 2 deletions
|
@ -17,8 +17,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||
* Update to https ([#2016](https://github.com/lbryio/lbry-desktop/pull/2016))
|
||||
* Simplify FileCard and FileTile component styling ([#2011](https://github.com/lbryio/lbry-desktop/pull/2011))
|
||||
* Credit card verification messaging ([#2025](https://github.com/lbryio/lbry-desktop/pull/2025))
|
||||
* Reverse Order & Use System/Location Time/Date ([#2036]https://github.com/lbryio/lbry-desktop/pull/2036)
|
||||
* Limit file type can be uploaded as thumbnail for publishing ([#2034](https://github.com/lbryio/lbry-desktop/pull/2034))
|
||||
|
||||
|
||||
### Fixed
|
||||
* Fixed Transactions filter menu collides with transaction table ([#2005](https://github.com/lbryio/lbry-desktop/pull/2005))
|
||||
* Invite table cutoff with large number of invites ([#1985](https://github.com/lbryio/lbry-desktop/pull/1985))
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
// @flow
|
||||
import React from 'react';
|
||||
import ButtonTransaction from 'component/common/transaction-link';
|
||||
import moment from 'moment';
|
||||
|
||||
type Reward = {
|
||||
id: string,
|
||||
|
@ -35,14 +36,14 @@ const RewardListClaimed = (props: Props) => {
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{rewards.map(reward => (
|
||||
{rewards.reverse().map(reward => (
|
||||
<tr key={reward.id}>
|
||||
<td>{reward.reward_title}</td>
|
||||
<td>{reward.reward_amount}</td>
|
||||
<td>
|
||||
<ButtonTransaction id={reward.transaction_id} />
|
||||
</td>
|
||||
<td>{reward.created_at.replace('Z', ' ').replace('T', ' ')}</td>
|
||||
<td>{moment(reward.created_at).format('LLL')}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
/* eslint-disable react/jsx-filename-extension */
|
||||
/* eslint-disable no-console */
|
||||
import App from 'component/app';
|
||||
import SnackBar from 'component/snackBar';
|
||||
import SplashScreen from 'component/splash';
|
||||
import moment from 'moment';
|
||||
import * as ACTIONS from 'constants/action_types';
|
||||
import { ipcRenderer, remote, shell } from 'electron';
|
||||
import React from 'react';
|
||||
|
@ -148,6 +150,8 @@ document.addEventListener('click', event => {
|
|||
});
|
||||
|
||||
const init = () => {
|
||||
moment.locale(remote.app.getLocale());
|
||||
|
||||
autoUpdater.on('error', error => {
|
||||
// eslint-disable-next-line no-console
|
||||
console.error(error.message);
|
||||
|
@ -201,3 +205,5 @@ const init = () => {
|
|||
};
|
||||
|
||||
init();
|
||||
|
||||
/* eslint-enable no-console */
|
||||
|
|
Loading…
Add table
Reference in a new issue