Skip to content

Commit

Permalink
fix: update text to specify local and remote changes (#723)
Browse files Browse the repository at this point in the history
* update notification text

* update diff view

* Last Remote Backup Change

* Last Remote Backup Change
  • Loading branch information
UziTech authored Aug 25, 2021
1 parent 60ecb68 commit 701f92e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions lib/utils/notify.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ Do you want to back up this file anyway?`.trim(),
let message, detail
if (diffData.localTime === diffData.backupTime) {
message = 'Your settings have changed since your last backup.'
detail = 'Last Backup: ' + new Date(diffData.localTime).toLocaleString()
detail = 'Last Local Sync: ' + new Date(diffData.localTime).toLocaleString()
} else {
message = 'Your backup has changed since your last restore.'
detail = 'Last Backup: ' + new Date(diffData.localTime).toLocaleString()
detail += '\nBackup Created: ' + new Date(diffData.backupTime).toLocaleString()
detail = 'Last Local Sync: ' + new Date(diffData.localTime).toLocaleString()
detail += '\nLast Remote Backup Change: ' + new Date(diffData.backupTime).toLocaleString()
}
const notification = notify.warning(`Sync-Settings: ${message}`, {
dismissable: true,
Expand Down
4 changes: 2 additions & 2 deletions lib/views/diff-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ module.exports = class DiffView {
return (
<div className='diff-view-diff'>
<pre className='diff-view-section'>
<div className='local'>Local - Last Backup: {diff.localTime ? new Date(diff.localTime).toLocaleString() : 'Never'}</div>
<div className='backup'>Backup - Backup Created: {new Date(diff.backupTime).toLocaleString()}</div>
<div className='local'>Local - Last Local Sync: {diff.localTime ? new Date(diff.localTime).toLocaleString() : 'Never'}</div>
<div className='backup'>Backup - Last Remote Backup Change: {new Date(diff.backupTime).toLocaleString()}</div>
</pre>
{diff.settings ? this.renderSettings(diff.settings) : null}
{diff.packages ? this.renderPackages(diff.packages) : null}
Expand Down

0 comments on commit 701f92e

Please sign in to comment.