Skip to content

Commit aad84d6

Browse files
committed
[DDW-1142] Updating changelog to link to correct ticket.
1 parent 3ceba18 commit aad84d6

File tree

4 files changed

+28
-21
lines changed

4 files changed

+28
-21
lines changed

CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## vNext
4+
5+
### Features
6+
7+
### Fixes
8+
9+
### Chores
10+
11+
- Fixed locale in Storybook ([PR 3062](https://github.com/input-output-hk/daedalus/pull/3062))
12+
313
## 5.1.0
414

515
### Chores
@@ -9,7 +19,6 @@
919
- Updated trezor-connect to v9 ([PR 3038](https://github.com/input-output-hk/daedalus/pull/3038))
1020
- Added analytics data collection ([PR 2927](https://github.com/input-output-hk/daedalus/pull/2927), [PR 2989](https://github.com/input-output-hk/daedalus/pull/2989), [PR 3003](https://github.com/input-output-hk/daedalus/pull/3003), [PR 3028](https://github.com/input-output-hk/daedalus/pull/3028))
1121
- Updated LedgerJS to 5.1.0 ([PR 3036](https://github.com/input-output-hk/daedalus/pull/3036))
12-
- Fix locale in Storybook ([PR 3042](https://github.com/input-output-hk/daedalus/pull/3042))
1322

1423
## 5.0.0
1524

source/renderer/app/components/loading/system-time-error/SystemTimeError.tsx

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,17 @@ class SystemTimeError extends Component<Props> {
104104
const isNTPServiceReachable = !!localTimeDifference;
105105
const allowedTimeDifferenceInSeconds = ALLOWED_TIME_DIFFERENCE / 1000000;
106106
const rawTimeOffset = (localTimeDifference || 0) / 1000;
107-
const timeOffset = currentLocale
108-
? humanizeDurationByLocale(rawTimeOffset, currentLocale, {
109-
delimiter: ' ',
110-
units: ['y', 'mo', 'w', 'd', 'h', 'm', 's', 'ms'],
111-
localeConfig: {
112-
'ja-JP': {
113-
spacer: '',
114-
delimiter: '',
115-
serialComma: false,
116-
},
117-
},
118-
})
119-
: null;
120-
107+
const timeOffset = humanizeDurationByLocale(rawTimeOffset, currentLocale, {
108+
delimiter: ' ',
109+
units: ['y', 'mo', 'w', 'd', 'h', 'm', 's', 'ms'],
110+
localeConfig: {
111+
'ja-JP': {
112+
spacer: '',
113+
delimiter: '',
114+
serialComma: false,
115+
},
116+
},
117+
});
121118
return (
122119
<div className={styles.component}>
123120
<SVGInline svg={attentionIcon} className={styles.icon} />

source/renderer/app/components/staking/delegation-center/DelegationCenterHeader.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,10 @@ class DelegationCenterHeader extends Component<Props, State> {
133133
const slot = get(networkTip, 'slot', '-');
134134
const headingFirst = intl.formatMessage(messages.headingRight);
135135
const headingSecond = intl.formatMessage(messages.headingLeft);
136-
const timeUntilFutureEpoch = currentLocale
137-
? humanizeDurationByLocale(this.state.timeUntilFutureEpoch, currentLocale)
138-
: null;
136+
const timeUntilFutureEpoch = humanizeDurationByLocale(
137+
this.state.timeUntilFutureEpoch,
138+
currentLocale
139+
);
139140
const description = intl.formatMessage(messages.description, {
140141
timeUntilFutureEpoch,
141142
});

source/renderer/app/components/wallet/settings/WalletRecoveryPhraseVerificationWidget.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ class WalletRecoveryPhraseVerificationWidget extends Component<Props> {
196196
times.warning,
197197
'days'
198198
);
199-
let timeUntilWarning = locale
200-
? moment().locale(locale).to(timeFromCreationToWarning, true)
201-
: null;
199+
let timeUntilWarning = moment()
200+
.locale(locale)
201+
.to(timeFromCreationToWarning, true);
202202

203203
// The content is generated by `moment`, but we need to replace `ヶ月` by `か月`
204204
if (locale === LOCALES.japanese) {

0 commit comments

Comments
 (0)