Skip to content

Commit 2af6b65

Browse files
DominikGuzeiDominikGuzei
authored
Merge pull request #2885 from input-output-hk/fix/ddw-941-rewards-export-remove-date-column
[DDW-941] / [DDW-938] Fix reward CSV export issues
2 parents b6fb69b + baf7b9c commit 2af6b65

File tree

5 files changed

+32
-37
lines changed

5 files changed

+32
-37
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
### Fixes
4444

45+
- Fixed rewards CSV export issues ([PR 2885](https://github.com/input-output-hk/daedalus/pull/2885))
4546
- Fixed behaviour of wallet settings option of the app menu ([PR 2838](https://github.com/input-output-hk/daedalus/pull/2838))
4647
- Fixed styling of ITN rewards feature ([PR 2861](https://github.com/input-output-hk/daedalus/pull/2861))
4748
- Fixed available disk space takes a long time to show ([PR 2849](https://github.com/input-output-hk/daedalus/pull/2849))

‎source/renderer/app/components/staking/rewards/StakingRewards.tsx‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { Button } from 'react-polymorph/lib/components/Button';
99
import { ButtonSkin } from 'react-polymorph/lib/skins/simple/ButtonSkin';
1010
import CopyToClipboard from 'react-copy-to-clipboard';
1111
import { DECIMAL_PLACES_IN_ADA } from '../../../config/numbersConfig';
12+
import { formattedWalletAmount } from '../../../utils/formatters';
1213
import {
1314
bigNumberComparator,
1415
stringComparator,
@@ -121,7 +122,7 @@ type State = {
121122
};
122123

123124
@observer
124-
class StakingRewards extends Component<Props, State> {
125+
export class StakingRewards extends Component<Props, State> {
125126
static contextTypes = {
126127
intl: intlShape.isRequired,
127128
};
@@ -145,18 +146,14 @@ class StakingRewards extends Component<Props, State> {
145146
) => {
146147
const { onExportCsv } = this.props;
147148
const { intl } = this.context;
148-
const exportedHeader = [
149-
...availableTableHeaders.map((header) => header.title),
150-
intl.formatMessage(messages.tableHeaderDate),
151-
];
152-
const date = new Date().toISOString();
149+
const exportedHeader = availableTableHeaders.map((header) => header.title);
153150
const exportedBody = sortedRewards.map((reward) => {
154151
const rewardWallet = get(reward, REWARD_FIELDS.WALLET_NAME);
155152
const isRestoring = get(reward, REWARD_FIELDS.IS_RESTORING);
156-
const rewardTotal = get(reward, REWARD_FIELDS.REWARD_TOTAL).toFormat(
153+
const rewardTotal = get(reward, REWARD_FIELDS.REWARD_TOTAL)?.toFixed(
157154
DECIMAL_PLACES_IN_ADA
158155
);
159-
const rewardUnspent = get(reward, REWARD_FIELDS.REWARD_UNSPENT).toFormat(
156+
const rewardUnspent = get(reward, REWARD_FIELDS.REWARD_UNSPENT)?.toFixed(
160157
DECIMAL_PLACES_IN_ADA
161158
);
162159
const rewardsAddress = get(reward, REWARD_FIELDS.REWARDS_ADDRESS);
@@ -165,7 +162,6 @@ class StakingRewards extends Component<Props, State> {
165162
rewardsAddress,
166163
isRestoring ? '-' : rewardTotal,
167164
isRestoring ? '-' : rewardUnspent,
168-
date,
169165
];
170166
});
171167
const exportedContent = [exportedHeader, ...exportedBody];
@@ -477,5 +473,3 @@ class StakingRewards extends Component<Props, State> {
477473
});
478474
};
479475
}
480-
481-
export default StakingRewards;

‎source/renderer/app/containers/staking/StakingRewardsPage.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { Component } from 'react';
22
import { observer, inject } from 'mobx-react';
33
import { defineMessages, intlShape } from 'react-intl';
4-
import StakingRewards from '../../components/staking/rewards/StakingRewards';
4+
import { StakingRewards } from '../../components/staking/rewards/StakingRewards';
55
import type { InjectedProps } from '../../types/injectedPropsType';
66
import { ellipsis } from '../../utils/strings';
77
import { getNetworkExplorerUrl } from '../../utils/network';

‎source/renderer/app/i18n/locales/defaultMessages.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6190,167 +6190,167 @@
61906190
"description": "Title \"Earned delegation rewards\" label on the staking rewards page.",
61916191
"end": {
61926192
"column": 3,
6193-
"line": 36
6193+
"line": 37
61946194
},
61956195
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
61966196
"id": "staking.rewards.title",
61976197
"start": {
61986198
"column": 9,
6199-
"line": 31
6199+
"line": 32
62006200
}
62016201
},
62026202
{
62036203
"defaultMessage": "!!!Rewards",
62046204
"description": "Filename prefix for the \"Export CSV\" on the staking rewards page.",
62056205
"end": {
62066206
"column": 3,
6207-
"line": 42
6207+
"line": 43
62086208
},
62096209
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
62106210
"id": "staking.rewards.csvFilenamePrefix",
62116211
"start": {
62126212
"column": 21,
6213-
"line": 37
6213+
"line": 38
62146214
}
62156215
},
62166216
{
62176217
"defaultMessage": "!!!Export CSV",
62186218
"description": "Label for the \"Export CSV\" button on the staking rewards page.",
62196219
"end": {
62206220
"column": 3,
6221-
"line": 48
6221+
"line": 49
62226222
},
62236223
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
62246224
"id": "staking.rewards.exportButtonLabel",
62256225
"start": {
62266226
"column": 21,
6227-
"line": 43
6227+
"line": 44
62286228
}
62296229
},
62306230
{
62316231
"defaultMessage": "!!!No rewards",
62326232
"description": "\"No rewards\" rewards label on staking rewards page.",
62336233
"end": {
62346234
"column": 3,
6235-
"line": 53
6235+
"line": 54
62366236
},
62376237
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
62386238
"id": "staking.rewards.no.rewards",
62396239
"start": {
62406240
"column": 13,
6241-
"line": 49
6241+
"line": 50
62426242
}
62436243
},
62446244
{
62456245
"defaultMessage": "!!!Wallet",
62466246
"description": "Table header \"Wallet\" label on staking rewards page",
62476247
"end": {
62486248
"column": 3,
6249-
"line": 58
6249+
"line": 59
62506250
},
62516251
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
62526252
"id": "staking.rewards.tableHeader.wallet",
62536253
"start": {
62546254
"column": 21,
6255-
"line": 54
6255+
"line": 55
62566256
}
62576257
},
62586258
{
62596259
"defaultMessage": "!!!Total rewards earned (ADA)",
62606260
"description": "Table header \"Total Reward\" label on staking rewards page",
62616261
"end": {
62626262
"column": 3,
6263-
"line": 63
6263+
"line": 64
62646264
},
62656265
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
62666266
"id": "staking.rewards.tableHeader.total",
62676267
"start": {
62686268
"column": 26,
6269-
"line": 59
6269+
"line": 60
62706270
}
62716271
},
62726272
{
62736273
"defaultMessage": "!!!Unspent (ADA)",
62746274
"description": "Table header \"Unspent\" label on staking rewards page",
62756275
"end": {
62766276
"column": 3,
6277-
"line": 68
6277+
"line": 69
62786278
},
62796279
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
62806280
"id": "staking.rewards.tableHeader.unspent",
62816281
"start": {
62826282
"column": 28,
6283-
"line": 64
6283+
"line": 65
62846284
}
62856285
},
62866286
{
62876287
"defaultMessage": "!!!Rewards address",
62886288
"description": "Table header \"Rewards address\" label on staking rewards page",
62896289
"end": {
62906290
"column": 3,
6291-
"line": 73
6291+
"line": 74
62926292
},
62936293
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
62946294
"id": "staking.rewards.tableHeader.rewardsAddress",
62956295
"start": {
62966296
"column": 29,
6297-
"line": 69
6297+
"line": 70
62986298
}
62996299
},
63006300
{
63016301
"defaultMessage": "!!!Date",
63026302
"description": "Table header \"Date\" label in exported csv file",
63036303
"end": {
63046304
"column": 3,
6305-
"line": 78
6305+
"line": 79
63066306
},
63076307
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
63086308
"id": "staking.rewards.tableHeader.date",
63096309
"start": {
63106310
"column": 19,
6311-
"line": 74
6311+
"line": 75
63126312
}
63136313
},
63146314
{
63156315
"defaultMessage": "!!!<p>Rewards earned by delegating your stake are automatically collected into your reward account.</p><p>Rewards earned on the Incentivized Testnet are not added to your Rewards wallet balance. They will be paid to you in real ada on the Cardano mainnet after the end of the Incentivized Testnet.</p><p>If you are using funds from this wallet to operate a stake pool, the rewards displayed here may include your pledged stake, which will not be counted when reward balances are paid out on the Cardano mainnet.</p>",
63166316
"description": "Rewards description text on staking rewards page",
63176317
"end": {
63186318
"column": 3,
6319-
"line": 84
6319+
"line": 85
63206320
},
63216321
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
63226322
"id": "staking.rewards.note",
63236323
"start": {
63246324
"column": 8,
6325-
"line": 79
6325+
"line": 80
63266326
}
63276327
},
63286328
{
63296329
"defaultMessage": "!!!Syncing {syncingProgress}%",
63306330
"description": "unknown stake pool label on staking rewards page.",
63316331
"end": {
63326332
"column": 3,
6333-
"line": 89
6333+
"line": 90
63346334
},
63356335
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
63366336
"id": "staking.delegationCenter.syncingTooltipLabel",
63376337
"start": {
63386338
"column": 23,
6339-
"line": 85
6339+
"line": 86
63406340
}
63416341
},
63426342
{
63436343
"defaultMessage": "!!!View in explorer",
63446344
"description": "View in explorer button label on staking rewards page.",
63456345
"end": {
63466346
"column": 3,
6347-
"line": 94
6347+
"line": 95
63486348
},
63496349
"file": "source/renderer/app/components/staking/rewards/StakingRewards.tsx",
63506350
"id": "staking.rewards.actionViewInExplorer",
63516351
"start": {
63526352
"column": 24,
6353-
"line": 90
6353+
"line": 91
63546354
}
63556355
}
63566356
],

‎storybook/stories/staking/Rewards.stories.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { map } from 'lodash';
33
import BigNumber from 'bignumber.js';
44
import { action } from '@storybook/addon-actions';
55
// Screens
6-
import StakingRewards from '../../../source/renderer/app/components/staking/rewards/StakingRewards';
6+
import { StakingRewards } from '../../../source/renderer/app/components/staking/rewards/StakingRewards';
77
// Dummy data initialization
88
import REWARDS from '../../../source/renderer/app/config/stakingRewards.dummy.json';
99

0 commit comments

Comments
 (0)