Changes in sync UI to allow test of service - subject to be redone

brave · Nov 14, 2019 · 9cda93a · 9cda93a
1 parent 578d968
commit 9cda93a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 21 deletions.
diff --git a/components/brave_sync/ui/components/app.tsx b/components/brave_sync/ui/components/app.tsx
@@ -39,7 +39,7 @@ export class SyncPage extends React.PureComponent<Props, {}> {
     return (
       <div id='syncPage'>
         {
-          syncData.isSyncConfigured && syncData.devices.length > 1
+          syncData.isSyncConfigured
             ? <EnabledContent syncData={syncData} actions={actions} />
             : <DisabledContent syncData={syncData} actions={actions} />
         }

diff --git a/components/brave_sync/ui/components/modals/enterSyncCode.tsx b/components/brave_sync/ui/components/modals/enterSyncCode.tsx
@@ -53,8 +53,7 @@ export default class EnterSyncCodeModal extends React.PureComponent<Props, State
       (
         this.state.willCreateNewSyncChainFromCode &&
         prevProps.syncData.isSyncConfigured !==
-        this.props.syncData.isSyncConfigured &&
-        this.props.syncData.devices.length > 1
+        this.props.syncData.isSyncConfigured
       )
     ) {
       this.setState({ willCreateNewSyncChainFromCode: false })
@@ -87,8 +86,8 @@ export default class EnterSyncCodeModal extends React.PureComponent<Props, State
   }
 
   onClickConfirmSyncCode = () => {
-    const { error, thisDeviceName } = this.props.syncData
-    if (thisDeviceName !== '' || error) {
+    const { error } = this.props.syncData
+    if (error) {  // Important for the STR
       return
     }
     const { passphrase } = this.state

diff --git a/components/brave_sync/ui/components/modals/removeDevice.tsx b/components/brave_sync/ui/components/modals/removeDevice.tsx
@@ -59,12 +59,7 @@ export default class RemoveMainDeviceModal extends React.PureComponent<Props, St
   }
 
   onClickConfirmRemoveDeviceButton = () => {
-    const { syncData, deviceName, deviceId } = this.props
-    // if there aren't enough devices, reset sync
-    if (syncData.devices.length < 2) {
-      this.props.actions.onSyncReset()
-      return
-    }
+    const { deviceName, deviceId } = this.props
     this.props.actions.onRemoveDevice(Number(deviceId), deviceName)
     this.setState({ willRemoveDevice: true })
   }

diff --git a/components/brave_sync/ui/components/modals/scanCode.tsx b/components/brave_sync/ui/components/modals/scanCode.tsx
@@ -52,7 +52,6 @@ export default class ScanCodeModal extends React.PureComponent<Props, State> {
 
   componentDidUpdate (prevProps: Readonly<Props>) {
     if (
-        this.props.syncData.devices.length > 1 &&
         prevProps.syncData.devices.length !==
         this.props.syncData.devices.length
     ) {
@@ -78,10 +77,10 @@ export default class ScanCodeModal extends React.PureComponent<Props, State> {
   }
 
   onDismissModal = () => {
-    const { devices, isSyncConfigured } = this.props.syncData
+    const { isSyncConfigured } = this.props.syncData
     // if user is still trying to build a sync chain,
     // open the confirmation modal. otherwise close it
-    isSyncConfigured && devices.length < 2
+    isSyncConfigured
       ? this.setState({ willCancelScanCode: true })
       : this.dismissAllModals()
   }
@@ -91,12 +90,12 @@ export default class ScanCodeModal extends React.PureComponent<Props, State> {
   }
 
   onConfirmDismissModal = () => {
-    const { devices, isSyncConfigured } = this.props.syncData
+    const { isSyncConfigured } = this.props.syncData
     // sync is enabled when at least 2 devices are in the chain.
     // this modal works both with sync enabled and disabled states.
     // in case user opens it in the enabled content screen,
     // check there are 2 devices in chain before reset
-    if (isSyncConfigured && devices.length < 2) {
+    if (isSyncConfigured) {
       this.props.actions.onSyncReset()
       this.dismissAllModals()
     }

diff --git a/components/brave_sync/ui/components/modals/viewSyncCode.tsx b/components/brave_sync/ui/components/modals/viewSyncCode.tsx
@@ -48,7 +48,6 @@ export default class ViewSyncCodeModal extends React.PureComponent<Props, State>
 
   componentDidUpdate (prevProps: Readonly<Props>) {
     if (
-        this.props.syncData.devices.length > 1 &&
         prevProps.syncData.devices.length !==
         this.props.syncData.devices.length
     ) {
@@ -74,10 +73,10 @@ export default class ViewSyncCodeModal extends React.PureComponent<Props, State>
   }
 
   onDismissModal = () => {
-    const { devices, isSyncConfigured } = this.props.syncData
+    const { isSyncConfigured } = this.props.syncData
     // if user is still trying to build a sync chain,
     // open the confirmation modal. otherwise close it
-    isSyncConfigured && devices.length < 2
+    isSyncConfigured
       ? this.setState({ willCancelViewCode: true })
       : this.dismissAllModals()
   }
@@ -87,12 +86,12 @@ export default class ViewSyncCodeModal extends React.PureComponent<Props, State>
   }
 
   onConfirmDismissModal = () => {
-    const { devices, isSyncConfigured } = this.props.syncData
+    const { isSyncConfigured } = this.props.syncData
     // sync is enabled when at least 2 devices are in the chain.
     // this modal works both with sync enabled and disabled states.
     // in case user opens it in the enabled content screen,
     // check there are 2 devices in chain before reset
-    if (isSyncConfigured && devices.length < 2) {
+    if (isSyncConfigured) {
       this.props.actions.onSyncReset()
       this.dismissAllModals()
     }