From 35858e3850fecfacbda470178d4f732e080e8e10 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.zhu@farmersedge.ca>
Date: Wed, 16 Nov 2022 00:55:23 -0600
Subject: [PATCH 1/2] [CAB-6032] Upgrade Realm and all other necessary
 libraries to support

---
 lib/Button.js          | 3 ++-
 lib/Card/index.js      | 3 ++-
 lib/Divider.js         | 5 +++--
 lib/Icon.js            | 2 +-
 lib/Toolbar.js         | 5 +++--
 lib/polyfill/Ripple.js | 4 ++--
 package.json           | 3 ++-
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/lib/Button.js b/lib/Button.js
index 2ff94b9..81786d4 100644
--- a/lib/Button.js
+++ b/lib/Button.js
@@ -1,6 +1,7 @@
 import React, {Component} from "react";
 import PropTypes from 'prop-types';
-import {ActivityIndicator, View, Text, TouchableNativeFeedback, Platform, ViewPropTypes} from "react-native";
+import { ActivityIndicator, View, Text, TouchableNativeFeedback, Platform } from "react-native";
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
 import Ripple from './polyfill/Ripple';
 import { TYPO, PRIMARY, THEME_NAME, PRIMARY_COLORS } from './config';
 import { getColor, isCompatible } from './helpers';
diff --git a/lib/Card/index.js b/lib/Card/index.js
index 5ad7e05..6df54b0 100644
--- a/lib/Card/index.js
+++ b/lib/Card/index.js
@@ -1,6 +1,7 @@
 import React, {Component} from "react";
 import PropTypes from 'prop-types';
-import {View, TouchableNativeFeedback, ViewPropTypes} from "react-native";
+import { View, TouchableNativeFeedback } from "react-native";
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
 import Ripple from '../polyfill/Ripple';
 import { getColor, isCompatible } from '../helpers';
 
diff --git a/lib/Divider.js b/lib/Divider.js
index 2e9339d..97efc5d 100644
--- a/lib/Divider.js
+++ b/lib/Divider.js
@@ -1,6 +1,7 @@
-import React, {Component} from "react";
+import React, { Component } from "react";
 import PropTypes from 'prop-types';
-import {View, ViewPropTypes} from "react-native";
+import { View } from "react-native";
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
 import { THEME_NAME } from './config';
 
 export default class Divider extends Component {
diff --git a/lib/Icon.js b/lib/Icon.js
index 08b981b..1f9ba70 100644
--- a/lib/Icon.js
+++ b/lib/Icon.js
@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import PropTypes from 'prop-types';
-import {View, ViewPropTypes} from "react-native";
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
 import { getColor } from './helpers';
 import VectorIconComponent from './VectorIconComponent';
 
diff --git a/lib/Toolbar.js b/lib/Toolbar.js
index b2c1a8b..e9d89be 100644
--- a/lib/Toolbar.js
+++ b/lib/Toolbar.js
@@ -1,6 +1,7 @@
-import React, {Component} from "react";
+import React, { Component } from "react";
 import PropTypes from 'prop-types';
-import {View, Text, ViewPropTypes} from "react-native";
+import { View, Text } from "react-native";
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
 import { TYPO, PRIMARY, THEME_NAME, PRIMARY_COLORS } from './config';
 import { getColor } from './helpers';
 import Icon from './Icon';
diff --git a/lib/polyfill/Ripple.js b/lib/polyfill/Ripple.js
index a61a57c..5666aa5 100644
--- a/lib/polyfill/Ripple.js
+++ b/lib/polyfill/Ripple.js
@@ -1,7 +1,7 @@
 import React, {Component} from "react";
 import PropTypes from 'prop-types';
-import {View, Animated, TouchableOpacity, Platform, ViewPropTypes} from "react-native";
-
+import {View, Animated, TouchableOpacity, Platform } from "react-native";
+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
 import elevationPolyfill from './Elevation';
 
 export default class Ripple extends Component {
diff --git a/package.json b/package.json
index fcdeba0..930a4eb 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,8 @@
   },
   "dependencies": {
     "react-native-material-design-styles": "git+https://github.com/react-native-material-design/react-native-material-design-styles.git",
-    "react-native-vector-icons": "^4.4.2"
+    "react-native-vector-icons": "^4.4.2",
+    "deprecated-react-native-prop-types": "2.3.0"
   },
   "description": "React Native Material Design Components",
   "devDependencies": {

From a9415bde840406049c0319cb23039bcc2e05a233 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.zhu@farmersedge.ca>
Date: Wed, 16 Nov 2022 14:03:10 -0600
Subject: [PATCH 2/2] [CAB-6032] Upgrade Realm and all other necessary
 libraries to support

---
 lib/Button.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Button.js b/lib/Button.js
index 81786d4..9976529 100644
--- a/lib/Button.js
+++ b/lib/Button.js
@@ -1,6 +1,6 @@
-import React, {Component} from "react";
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { ActivityIndicator, View, Text, TouchableNativeFeedback, Platform } from "react-native";
+import { ActivityIndicator, View, Text, TouchableNativeFeedback, Platform, TextStyle } from 'react-native';
 import { ViewPropTypes } from 'deprecated-react-native-prop-types';
 import Ripple from './polyfill/Ripple';
 import { TYPO, PRIMARY, THEME_NAME, PRIMARY_COLORS } from './config';
@@ -22,9 +22,9 @@ export default class Button extends Component {
         activityIndicatorColor: PropTypes.string,
         raised: PropTypes.bool,
         styles: PropTypes.shape({
-            button:   ViewPropTypes.style,
+            button: ViewPropTypes.style,
             disabled: ViewPropTypes.style,
-            text:     Text.propTypes.style
+            text: PropTypes.shape(TextStyle)
         }),
         onPress: PropTypes.func,
         onLongPress: PropTypes.func,
@@ -38,7 +38,7 @@ export default class Button extends Component {
         raised: false,
         activityIndicatorColor: 'black',
         styles: {
-            disabled: {opacity: 0.5}
+            disabled: { opacity: 0.5 }
         }
     };