Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DDW-504] Daedalus start with time offset to the past #1194

Merged
merged 2 commits into from
Nov 26, 2018
Merged

[DDW-504] Daedalus start with time offset to the past #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc1b59c
[DDW-504] Fix Daedalus start when time is offset to the past
nikolaglumac Nov 23, 2018
b6c1ad6
Merge branch 'release/0.12.0' into fix/ddw-504-daedalus-start-with-ti…
nikolaglumac Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Changelog
- Implemented support for Cardano node "structured logging" ([PR 1092](https://github.com/input-output-hk/daedalus/pull/1092), [PR 1122](https://github.com/input-output-hk/daedalus/pull/1122))
- Implemented the IPC driven Cardano node / Daedalus communication ([PR 1075](https://github.com/input-output-hk/daedalus/pull/1075), [PR 1107](https://github.com/input-output-hk/daedalus/pull/1107), [PR 1109](https://github.com/input-output-hk/daedalus/pull/1109), [PR 1115](https://github.com/input-output-hk/daedalus/pull/1115), [PR 1118](https://github.com/input-output-hk/daedalus/pull/1118), [PR 1119](https://github.com/input-output-hk/daedalus/pull/1119), [PR 1162](https://github.com/input-output-hk/daedalus/pull/1162))
- Improved the loading UX ([PR 723](https://github.com/input-output-hk/daedalus/pull/723))
- Improved the NTP check handling ([PR 1086](https://github.com/input-output-hk/daedalus/pull/1086), [PR 1149](https://github.com/input-output-hk/daedalus/pull/1149), [PR 1158](https://github.com/input-output-hk/daedalus/pull/1158))
- Improved the NTP check handling ([PR 1086](https://github.com/input-output-hk/daedalus/pull/1086), [PR 1149](https://github.com/input-output-hk/daedalus/pull/1149), [PR 1158](https://github.com/input-output-hk/daedalus/pull/1158), [PR 1194](https://github.com/input-output-hk/daedalus/pull/1194))
- Improved the transaction details text selection ([PR 1073](https://github.com/input-output-hk/daedalus/pull/1073), [PR 1095](https://github.com/input-output-hk/daedalus/pull/1095))
- Integrated Cardano V1 API endpoints ([PR 1018](https://github.com/input-output-hk/daedalus/pull/1018), [PR 1031](https://github.com/input-output-hk/daedalus/pull/1031), [PR 1037](https://github.com/input-output-hk/daedalus/pull/1037), [PR 1042](https://github.com/input-output-hk/daedalus/pull/1042), [PR 1045](https://github.com/input-output-hk/daedalus/pull/1045), [PR 1070](https://github.com/input-output-hk/daedalus/pull/1070), [PR 1078](https://github.com/input-output-hk/daedalus/pull/1078), [PR 1079](https://github.com/input-output-hk/daedalus/pull/1079), [PR 1080](https://github.com/input-output-hk/daedalus/pull/1080), [PR 1088](https://github.com/input-output-hk/daedalus/pull/1088))
- Refactored and improved `NetworkStatus` store to use V1 API data ([PR 1081](https://github.com/input-output-hk/daedalus/pull/1081))
Expand Down
28 changes: 13 additions & 15 deletions source/renderer/app/components/loading/Loading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,18 @@ export default class Loading extends Component<Props, State> {
loadingDataForNextScreenMessage
} = this.props;

if (!isConnected) {
if (!isSystemTimeCorrect) {
return (
<SystemTimeErrorOverlay
localTimeDifference={localTimeDifference}
currentLocale={currentLocale}
onProblemSolutionClick={onProblemSolutionClick}
onCheckTheTimeAgain={onCheckTheTimeAgain}
onContinueWithoutClockSyncCheck={onContinueWithoutClockSyncCheck}
isCheckingSystemTime={isCheckingSystemTime}
/>
);
} else if (!isConnected) {
const finalCardanoNodeStates = [
CardanoNodeStates.STOPPED,
CardanoNodeStates.UPDATED,
Expand All @@ -269,25 +280,13 @@ export default class Loading extends Component<Props, State> {
styles.headline,
includes(finalCardanoNodeStates, cardanoNodeState) ? styles.withoutAnimation : null,
]);

return (
<div className={styles.connecting}>
<h1 className={headlineClasses}>
{intl.formatMessage(this._getConnectingMessage())}
</h1>
</div>
);
} else if (!isSystemTimeCorrect) {
return (
<SystemTimeErrorOverlay
localTimeDifference={localTimeDifference}
currentLocale={currentLocale}
onProblemSolutionClick={onProblemSolutionClick}
onCheckTheTimeAgain={onCheckTheTimeAgain}
onContinueWithoutClockSyncCheck={onContinueWithoutClockSyncCheck}
isCheckingSystemTime={isCheckingSystemTime}
/>
);
} else if (!isSynced) {
return (
<div className={styles.syncing}>
Expand All @@ -308,8 +307,7 @@ export default class Loading extends Component<Props, State> {
</div>
</div>
);
}

};

render() {
const { intl } = this.context;
Expand Down