From 4a22990883818e7958fece4123d00574ff428b0d Mon Sep 17 00:00:00 2001
From: Anthony Tseng <darkdh@gmail.com>
Date: Wed, 22 Jul 2020 16:07:37 -0700
Subject: [PATCH] Get and update sync code only after sync chain is created
 Otherwise, we end up caching wrong sync code when page is loaded and it will
 only be updated after a page refresh

---
 .../brave_sync_page/brave_sync_configure.js   | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/browser/resources/settings/brave_sync_page/brave_sync_configure.js b/browser/resources/settings/brave_sync_page/brave_sync_configure.js
index ba27ccdbe1e2..5356b97d97ed 100644
--- a/browser/resources/settings/brave_sync_page/brave_sync_configure.js
+++ b/browser/resources/settings/brave_sync_page/brave_sync_configure.js
@@ -63,11 +63,7 @@ Polymer({
   },
 
   attached: async function() {
-    const [syncCode, deviceList] = await Promise.all([
-      this.browserProxy_.getSyncCode(),
-      this.browserProxy_.getDeviceList()
-    ])
-    this.syncCode = syncCode
+    const deviceList = await this.browserProxy_.getDeviceList()
     this.addWebUIListener('device-info-changed', this.handleDeviceInfo_.bind(this))
     this.handleDeviceInfo_(deviceList)
   },
@@ -82,11 +78,24 @@ Polymer({
     return displayDate.toDateString()
   },
 
-  onViewSyncCode_: function() {
+  /*
+   * This only sets sync code when it is not already set. It needs to be cleared
+   * when sync chain reset
+   */
+  ensureSetSyncCode_: async function() {
+    if (!!this.syncCode)
+      return
+    const syncCode = await this.browserProxy_.getSyncCode()
+    this.syncCode = syncCode
+  },
+
+  onViewSyncCode_: async function() {
+    await this.ensureSetSyncCode_()
     this.syncCodeDialogType_ = 'words'
   },
 
-  onAddDevice_: function() {
+  onAddDevice_: async function() {
+    await this.ensureSetSyncCode_()
     this.syncCodeDialogType_ = 'choose'
   },
 
@@ -101,6 +110,9 @@ Polymer({
       return
     }
     await this.browserProxy_.resetSyncChain();
+    // Clear sync code because user might use the same page to create a new sync
+    // chain without reload
+    this.syncCode = undefined
     const router = Router.getInstance();
     router.navigateTo(router.getRoutes().BRAVE_SYNC);
   }