From 2bbedd9def2a782f370fb5280994ea0ecbf8a7c7 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Thu, 18 May 2017 09:28:18 -0400
Subject: Updating client dependencies. Switching to yarn.  (#6433)

* Updating client dependancies. Switching to using yarn.

* Updating React

* Moving pure components to using function syntax (performance gains with newer react version)

* Updating client dependancies.

* Ignore .yarninstall

* Enabling pre-lockfile because it's the entire point of using yarn.

* Removing old webpack config

* Moving to new prop-types

* Fixing ESLint Errors

* Updating jest snapshots.

* Cleaning up package.json
---
 .../user_settings/desktop_notification_settings.jsx  | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'webapp/components/user_settings/desktop_notification_settings.jsx')

diff --git a/webapp/components/user_settings/desktop_notification_settings.jsx b/webapp/components/user_settings/desktop_notification_settings.jsx
index d94c02007..79d500c88 100644
--- a/webapp/components/user_settings/desktop_notification_settings.jsx
+++ b/webapp/components/user_settings/desktop_notification_settings.jsx
@@ -7,6 +7,8 @@ import SettingItemMax from 'components/setting_item_max.jsx';
 import * as Utils from 'utils/utils.jsx';
 import * as UserAgent from 'utils/user_agent.jsx';
 
+import PropTypes from 'prop-types';
+
 import React from 'react';
 import {FormattedMessage} from 'react-intl';
 
@@ -451,13 +453,13 @@ export default class DesktopNotificationSettings extends React.Component {
 }
 
 DesktopNotificationSettings.propTypes = {
-    activity: React.PropTypes.string.isRequired,
-    sound: React.PropTypes.string.isRequired,
-    duration: React.PropTypes.string.isRequired,
-    updateSection: React.PropTypes.func,
-    setParentState: React.PropTypes.func,
-    submit: React.PropTypes.func,
-    cancel: React.PropTypes.func,
-    error: React.PropTypes.string,
-    active: React.PropTypes.bool
+    activity: PropTypes.string.isRequired,
+    sound: PropTypes.string.isRequired,
+    duration: PropTypes.string.isRequired,
+    updateSection: PropTypes.func,
+    setParentState: PropTypes.func,
+    submit: PropTypes.func,
+    cancel: PropTypes.func,
+    error: PropTypes.string,
+    active: PropTypes.bool
 };
-- 
cgit v1.2.3-1-g7c22

