-
Notifications
You must be signed in to change notification settings - Fork 975
Conversation
25e4a30
to
75c689d
Compare
@@ -347,10 +363,15 @@ syncResetMessageOtherDevices=If you've synced other devices, they will continue | |||
syncResetMessageWhat=Resetting Sync clears data stored on the Sync server and resets this device's Sync settings. | |||
syncResetMessageWhatNot=You will keep any bookmarks, history and other browsing data currently on this device. | |||
syncRetryButton=Try again | |||
syncScan=Scan the code | |||
syncWelcome1=Brave Sync allows you to sync bookmarks, tabs, history and other data privately between your Brave Browsers on your varios devices. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
various
@@ -1015,7 +1015,8 @@ module.exports.defaultAppState = () => { | |||
lastFetchTimestamp: 0, | |||
objectsById: {}, | |||
pendingRecords: {}, | |||
lastConfirmedRecordTimestamp: 0 | |||
lastConfirmedRecordTimestamp: 0, | |||
setupCompleted: false |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please add this to docs/state.md
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done 👍
package.json
Outdated
"run": [ | ||
"lint", | ||
"pre-push-tests" | ||
] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this have been removed? (btw you can delete the commit hooks in .git/hooks
instead so it doesn't change any files that are checked into git)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ya shouldn't be removed. added back
is this blocked on #13313? |
return | ||
} | ||
} | ||
window.alert('Invalid input code; please try again or create a new profile.') | ||
} | ||
|
||
render () { | ||
console.log(JSON.stringify(this.props.syncData.get('devices'))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
extra console.log
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh noes! fixed
75c689d
to
4eda8cd
Compare
ref #13197 (comment)
I'll fix it. I only tested with copy/paste, which works but should work with any user input
I'm not sure if I followed right but you can't hit
Ya that's a bug. Addressed in 260ba3e |
removing reviewers and setting as |
Auditors: @cezaraugusto
- Update display of codes to use bip39 - Update input of codes to handle either bip39 or niceware - On recovery (input), only enable button if word length is 16 or 24 First half of implementation for #13313 Auditors: @cezaraugusto
fda5078
to
9b27f97
Compare
reviews request addressed, left a question regarding Screenshots for passphrase warning added in #13197 (comment). We're ready for a re-review |
@cezaraugusto looks good but the QR code is also private and should show a warning on this screen |
Added notice for QR code screen per #13197 (comment): Phrase is the same as other screens cc @bradleyrichter if this one needs adjustment |
@@ -563,6 +565,9 @@ const handleAppAction = (action) => { | |||
if (device.name) { | |||
appState = appState.setIn(['sync', 'devices', deviceId, 'name'], device.name) | |||
} | |||
if (!hasMainDevice && getSetting(settings.SYNC_DEVICE_NAME) === device.name) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think this line just sets the mainDevice to be true for any device with the same name as the current device, since SYNC_DEVICE_NAME
is the name of the current device. is that the intended behavior?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(as long as the current device doesn't know of any existing main devices)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good! two follow up issues:
Great job on this PR - I know you've already shifted work towards Brave Core. I captured what has been done so far with brave/brave-browser#356 for when we do chose to implement this 😄 |
Closes #12269
Closes #9254
Closes #12356
Test Plan:
npm start
andnpm run start2
so you can sync between devicesScreenshots UPDATED: