Adds transition for disabled wallets

Resolves brave#11611 Auditors: Test Plan:
NejcZdovc · Oct 20, 2017 · c18ba1d · c18ba1d
1 parent 153f110
commit c18ba1d
Showing 1 changed file with 23 additions and 10 deletions.
diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js
@@ -155,17 +155,12 @@ const notifications = {
     }, notifications.pollingInterval, state)
   },
   onLaunch: (state) => {
-    if (!getSetting(settings.PAYMENTS_ENABLED)) {
+    const enabled = getSetting(settings.PAYMENTS_ENABLED)
+    if (!enabled) {
       return state
     }
 
-    // One time conversion of wallet
-    const isNewInstall = state.get('firstRunTimestamp') === state.getIn(['migrations', 'batMercuryTimestamp'])
-    const hasUpgradedWallet = state.getIn(['migrations', 'batMercuryTimestamp']) !== state.getIn(['migrations', 'btc2BatTimestamp'])
-    if (!isNewInstall && !hasUpgradedWallet) {
-      state = state.setIn(['migrations', 'btc2BatTransitionPending'], true)
-      module.exports.transitionWalletToBat()
-    }
+    checkBtcBatMigrated(state, enabled)
 
     if (hasFunds(state)) {
       // Don't bother processing the rest, which are only notifications.
@@ -1306,8 +1301,12 @@ const initSynopsis = (state) => {
 }
 
 const enable = (state, paymentsEnabled) => {
-  if (paymentsEnabled && !getSetting(settings.PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED)) {
-    appActions.changeSetting(settings.PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED, true)
+  if (paymentsEnabled) {
+    checkBtcBatMigrated(state, paymentsEnabled)
+
+    if (!getSetting(settings.PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED)) {
+      appActions.changeSetting(settings.PAYMENTS_NOTIFICATION_TRY_PAYMENTS_DISMISSED, true)
+    }
   }
 
   if (synopsis) {
@@ -2262,6 +2261,20 @@ const yoDawg = (stateState) => {
   return stateState
 }
 
+const checkBtcBatMigrated = (state, status) => {
+  if (!status) {
+    return state
+  }
+
+  // One time conversion of wallet
+  const isNewInstall = state.get('firstRunTimestamp') === state.getIn(['migrations', 'batMercuryTimestamp'])
+  const hasUpgradedWallet = state.getIn(['migrations', 'batMercuryTimestamp']) !== state.getIn(['migrations', 'btc2BatTimestamp'])
+  if (!isNewInstall && !hasUpgradedWallet) {
+    state = state.setIn(['migrations', 'btc2BatTransitionPending'], true)
+    module.exports.transitionWalletToBat()
+  }
+}
+
 let newClient = null
 const transitionWalletToBat = () => {
   let newPaymentId, result