Release braintree-web 3.85.1 source

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+# 3.85.1
+
+  - Venmo
+    - Fix issue where iOS Chrome was reporting as a supported browser
+
 # 3.85.0 
 
  - Client

package.json

@@ -1,6 +1,6 @@
 {
   "name": "braintree-web",
-  "version": "3.85.0",
+  "version": "3.85.1",
   "license": "MIT",
   "main": "src/index.js",
   "private": true,

src/venmo/shared/browser-detection.js

@@ -33,11 +33,22 @@ function isFacebookOwnedBrowserOnAndroid() {
   return ua.indexOf('fb_iab') > -1 || ua.indexOf('instagram') > -1;
 }
 
+// iOS chrome used to work with Venmo, but now it does not
+// we are unsure if something changed in the iOS Chrome app
+// itself, or if something about iOS webviews has changed
+// until we find out more info, we've created a helper to
+// easilly turn off iOS Chrome as a supported browser in
+// the isBrowserSupported helper function
+function isIosChrome() {
+  return isIos() && isChrome();
+}
+
 module.exports = {
   isAndroid: isAndroid,
   isAndroidWebview: isAndroidWebview,
   isChrome: isChrome,
   isIos: isIos,
+  isIosChrome: isIosChrome,
   isIosSafari: isIosSafari,
   isIosWebview: isIosWebview,
   isFacebookOwnedBrowserOnAndroid: isFacebookOwnedBrowserOnAndroid,

src/venmo/shared/supports-venmo.js

@@ -5,7 +5,8 @@ var browserDetection = require('./browser-detection');
 function isBrowserSupported(options) {
   var merchantAllowsReturningToNewBrowserTab, merchantAllowsWebviews, merchantAllowsDesktopBrowsers;
   var isAndroid = browserDetection.isAndroid();
-  var isMobileDevice = isAndroid || browserDetection.isIos();
+  var isSupportedMobileDevice = isAndroid ||
+    (browserDetection.isIos() && !browserDetection.isIosChrome());
   var isAndroidChrome = isAndroid && browserDetection.isChrome();
   var isMobileDeviceThatSupportsReturnToSameTab = browserDetection.isIosSafari() || isAndroidChrome;
 
@@ -30,15 +31,15 @@ function isBrowserSupported(options) {
       return true;
     }
 
-    return merchantAllowsDesktopBrowsers && !isMobileDevice;
+    return merchantAllowsDesktopBrowsers && !isSupportedMobileDevice;
   }
 
   if (browserDetection.isFacebookOwnedBrowserOnAndroid()) {
     return false;
   }
 
   if (!merchantAllowsDesktopBrowsers) {
-    return isMobileDevice;
+    return isSupportedMobileDevice;
   }
 
   return true;

test/venmo/unit/browser-detection.js

@@ -54,6 +54,27 @@ describe('browser detection', () => {
     });
   });
 
+  describe('isIosChrome', () => {
+    it('returns true when isIos and isChrome return true', () => {
+      isChrome.mockReturnValue(true);
+      isIos.mockReturnValue(true);
+
+      expect(browserDetection.isIosChrome()).toBe(true);
+    });
+
+    it('returns false when either isIos or isChrome do not return true', () => {
+      isChrome.mockReturnValue(false);
+      isIos.mockReturnValue(true);
+
+      expect(browserDetection.isIosChrome()).toBe(false);
+
+      isChrome.mockReturnValue(true);
+      isIos.mockReturnValue(false);
+
+      expect(browserDetection.isIosChrome()).toBe(false);
+    });
+  });
+
   describe('isFacebookOwnedBrowserOnAndroid', () => {
     let userAgentSpy;
 

test/venmo/unit/is-browser-supported.js

@@ -11,6 +11,7 @@ describe('isBrowserSupported', () => {
     browserDetection.isIos.mockReturnValue(false);
 
     browserDetection.isChrome.mockReturnValue(false);
+    browserDetection.isIosChrome.mockReturnValue(false);
     browserDetection.isIosSafari.mockReturnValue(false);
     browserDetection.isIosWebview.mockReturnValue(false);
     browserDetection.isAndroidWebview.mockReturnValue(false);
@@ -33,11 +34,12 @@ describe('isBrowserSupported', () => {
       expect(isBrowserSupported()).toBe(true);
     });
 
-    it('returns true for iOS Chrome', () => {
+    it('returns false for iOS Chrome', () => {
+      // so that it would normally pass for being iOS
       browserDetection.isIos.mockReturnValue(true);
-      browserDetection.isChrome.mockReturnValue(true);
+      browserDetection.isIosChrome.mockReturnValue(true);
 
-      expect(isBrowserSupported()).toBe(true);
+      expect(isBrowserSupported()).toBe(false);
     });
 
     it('returns true for Android Chrome', () => {