Merge pull request #14726 from bsclifton/fix-renderer-errors

Fix renderer errors
brave · Jul 13, 2018 · 0f79796 · 0f79796
1 parent f0a4d8d
commit 0f79796
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/app/renderer/components/preferences/payment/enabledContent.js b/app/renderer/components/preferences/payment/enabledContent.js
@@ -267,13 +267,13 @@ class EnabledContent extends ImmutableComponent {
   }
 
   statusMessage () {
-    const promo = this.props.ledgerData.get('promotion') || Immutable.Map()
-    const status = this.props.ledgerData.get('status') || ''
-    const successText = promo.getIn(['panel', 'successText'])
-    const promotionStatus = promo.get('promotionStatus')
+    const promo = (this.props.ledgerData && this.props.ledgerData.get('promotion')) || Immutable.Map()
+    const status = (this.props.ledgerData && this.props.ledgerData.get('status')) || ''
+    const successText = promo && promo.getIn(['panel', 'successText'])
+    const promotionStatus = promo && promo.get('promotionStatus')
     let isPromotion = true
 
-    if ((!successText || !promo.has('claimedTimestamp')) && !promotionStatus) {
+    if ((!successText || (promo && !promo.has('claimedTimestamp'))) && !promotionStatus) {
       isPromotion = false
       if (status.length === 0) {
         return
@@ -284,9 +284,9 @@ class EnabledContent extends ImmutableComponent {
 
     if (isPromotion) {
       showClose = true
-      title = successText.get('title')
-      message = successText.get('message')
-      text = promo.getIn(['panel', 'disclaimer'])
+      title = successText && successText.get('title')
+      message = successText && successText.get('message')
+      text = promo && promo.getIn(['panel', 'disclaimer'])
       rightButton = <BrowserButton
         secondaryColor
         l10nId={'paymentHistoryOKText'}

diff --git a/js/contextMenus.js b/js/contextMenus.js
@@ -1236,6 +1236,9 @@ function mainTemplateInit (nodeProps, frame, tab) {
         info['menuItemId'] = extensionContextMenu.menuItemId
         if (extensionContextMenu.properties.parentId) {
           info['parentMenuItemId'] = extensionContextMenu.properties.parentId
+          if (!templateMap[extensionContextMenu.properties.parentId]) {
+            return
+          }
           if (templateMap[extensionContextMenu.properties.parentId].submenu === undefined) {
             templateMap[extensionContextMenu.properties.parentId].submenu = []
           }