Merge pull request #13973 from NejcZdovc/fix/#13972-server

Adds server problem overlay
brave · May 1, 2018 · cea9a88 · cea9a88
1 parent 47a615e
commit cea9a88
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 4 deletions.
diff --git a/app/browser/api/ledger.js b/app/browser/api/ledger.js
@@ -1785,7 +1785,12 @@ const getPaymentInfo = (state) => {
 
     client.getWalletProperties(amount, currency, function (err, body) {
       if (err) {
-        console.error('getWalletProperties error: ' + err.toString())
+        if (err.message) {
+          console.error('getWalletProperties error: ' + err.message)
+        } else {
+          console.error('getWalletProperties error: ' + err.toString())
+        }
+        appActions.onWalletPropertiesError()
         return
       }
 
@@ -1824,6 +1829,11 @@ const setNewTimeUntilReconcile = (newReconcileTime = null) => {
 }
 
 const onWalletProperties = (state, body) => {
+  const currentStatus = ledgerState.getAboutProp(state, 'status')
+  if (currentStatus === ledgerStatuses.SERVER_PROBLEM) {
+    state = ledgerState.setAboutProp(state, 'status', '')
+  }
+
   if (body == null) {
     return state
   }

diff --git a/app/browser/reducers/ledgerReducer.js b/app/browser/reducers/ledgerReducer.js
@@ -11,6 +11,7 @@ const appConstants = require('../../../js/constants/appConstants')
 const windowConstants = require('../../../js/constants/windowConstants')
 const settings = require('../../../js/constants/settings')
 const tabActionConstants = require('../../common/constants/tabAction')
+const ledgerStatuses = require('../../common/constants/ledgerStatuses')
 
 // State
 const ledgerState = require('../../common/state/ledgerState')
@@ -522,6 +523,11 @@ const ledgerReducer = (state, action, immutableAction) => {
         )
         break
       }
+    case appConstants.APP_ON_WALLET_PROPERTIES_ERROR:
+      {
+        state = ledgerState.setAboutProp(state, 'status', ledgerStatuses.SERVER_PROBLEM)
+        break
+      }
     case appConstants.APP_ON_LEDGER_BACKUP_SUCCESS:
       {
         state = aboutPreferencesState.setBackupStatus(state, true)

diff --git a/app/common/constants/ledgerStatuses.js b/app/common/constants/ledgerStatuses.js
@@ -4,7 +4,8 @@
 
 const statuses = {
   CORRUPTED_SEED: 'corruptedSeed',
-  IN_PROGRESS: 'contributionInProgress'
+  IN_PROGRESS: 'contributionInProgress',
+  SERVER_PROBLEM: 'serverProblem'
 }
 
 module.exports = statuses
diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties
@@ -162,6 +162,9 @@ lastPass=LastPass&reg;
 ledgerBackupText1=Below, you will find the anonymized recovery key that is required if you ever lose access to this computer.
 ledgerBackupText2=Make sure you keep this key private, or else your wallet will be compromised.
 ledgerBackupTitle=Backup your Brave wallet
+ledgerNetworkErrorMessage=The Brave Payments server is not responding. We will fix this as soon as possible.
+ledgerNetworkErrorTitle=Uh oh.
+ledgerNetworkErrorText=Note: This error could also be caused by a network connection problem.
 ledgerPaymentsShown=Brave Payments
 ledgerRecoveryContent=Note: The recovered BAT wallet will replace the current BAT wallet, which will be discarded.
 ledgerRecoveryFailedMessage=Please re-enter keys or try different keys.

diff --git a/app/locale.js b/app/locale.js
@@ -290,7 +290,10 @@ var rendererIdentifiers = function () {
     'promotionClaimedErrorTitle',
     'corruptedOverlayTitle',
     'corruptedOverlayMessage',
-    'corruptedOverlayText'
+    'corruptedOverlayText',
+    'ledgerNetworkErrorTitle',
+    'ledgerNetworkErrorMessage',
+    'ledgerNetworkErrorText'
   ].concat(countryCodes).concat(availableLanguages)
 }
 

diff --git a/app/renderer/components/preferences/payment/enabledContent.js b/app/renderer/components/preferences/payment/enabledContent.js
@@ -317,6 +317,15 @@ class EnabledContent extends ImmutableComponent {
             />
             break
           }
+
+        case ledgerStatuses.SERVER_PROBLEM:
+          {
+            showClose = false
+            title = locale.translation('ledgerNetworkErrorTitle')
+            message = locale.translation('ledgerNetworkErrorMessage')
+            text = locale.translation('ledgerNetworkErrorText')
+            break
+          }
         default:
           {
             return

diff --git a/js/actions/appActions.js b/js/actions/appActions.js
@@ -1976,6 +1976,12 @@ const appActions = {
     })
   },
 
+  onWalletPropertiesError: function () {
+    dispatch({
+      actionType: appConstants.APP_ON_WALLET_PROPERTIES_ERROR
+    })
+  },
+
   onPublisherToggleUpdate: function () {
     dispatch({
       actionType: appConstants.APP_ON_PUBLISHER_TOGGLE_UPDATE

diff --git a/js/constants/appConstants.js b/js/constants/appConstants.js
@@ -200,6 +200,7 @@ const appConstants = {
   APP_ON_LEDGER_MEDIA_PUBLISHER: _,
   APP_ON_LEDGER_BACKUP_SUCCESS: _,
   APP_ADD_PUBLISHER_TO_LEDGER: _,
+  APP_ON_WALLET_PROPERTIES_ERROR: _,
   APP_ON_PUBLISHER_TOGGLE_UPDATE: _
 }
 

diff --git a/test/unit/app/browser/api/ledgerTest.js b/test/unit/app/browser/api/ledgerTest.js
@@ -1259,7 +1259,7 @@ describe('ledger api unit tests', function () {
       })
 
       it('null case', function () {
-        ledgerApi.onWalletProperties()
+        ledgerApi.onWalletProperties(state)
         assert(generatePaymentDataSpy.notCalled)
       })