diff --git a/package-lock.json b/package-lock.json index 4a9b6a8ee91..27ecb29ee7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55108,6 +55108,16 @@ "node": ">= 0.6" } }, + "node_modules/deprecated-react-native-prop-types": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/deprecated-react-native-prop-types/-/deprecated-react-native-prop-types-2.3.0.tgz", + "integrity": "sha512-pWD0voFtNYxrVqvBMYf5gq3NA2GCpfodS1yNynTPc93AYA/KEMGeWDqqeUB6R2Z9ZofVhks2aeJXiuQqKNpesA==", + "dependencies": { + "@react-native/normalize-color": "*", + "invariant": "*", + "prop-types": "*" + } + }, "node_modules/dequal": { "version": "2.0.3", "license": "MIT", @@ -87459,6 +87469,14 @@ "react-native-svg": "^9.6.4" } }, + "node_modules/react-native-radial-gradient": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/react-native-radial-gradient/-/react-native-radial-gradient-1.1.4.tgz", + "integrity": "sha512-8nNGfXg1bjP4onZaorqgCTEuZtCN+sovg+TBuwT171Z6gtanJf0ZOFtKefISFgrUNyIqhpJVvKUZE8GQdnsY6A==", + "dependencies": { + "deprecated-react-native-prop-types": "^2.3.0" + } + }, "node_modules/react-native-randombytes": { "version": "3.6.1", "license": "ISC", @@ -141677,22 +141695,6 @@ "react-native-svg": "^13.2.0" } }, - "packages/mobile/node_modules/react-native-radial-gradient": { - "version": "1.1.4", - "license": "MIT", - "dependencies": { - "deprecated-react-native-prop-types": "^2.3.0" - } - }, - "packages/mobile/node_modules/react-native-radial-gradient/node_modules/deprecated-react-native-prop-types": { - "version": "2.3.0", - "license": "MIT", - "dependencies": { - "@react-native/normalize-color": "*", - "invariant": "*", - "prop-types": "*" - } - }, "packages/mobile/node_modules/react-native-restart": { "version": "0.0.27", "license": "MIT", diff --git a/packages/mobile/ios/Podfile b/packages/mobile/ios/Podfile index 2fd9cb595c1..4c163cfa1c5 100644 --- a/packages/mobile/ios/Podfile +++ b/packages/mobile/ios/Podfile @@ -31,7 +31,7 @@ project 'AudiusReactNative', 'Prod.Release' => :release target 'AudiusReactNative' do - pod 'SRSRadialGradient', :path => '../node_modules/react-native-radial-gradient/ios' + pod 'SRSRadialGradient', :path => '../../../node_modules/react-native-radial-gradient/ios' pod 'ffmpeg-kit-react-native', :subspecs => ['https-gpl-lts'], :podspec => '../node_modules/ffmpeg-kit-react-native/ffmpeg-kit-react-native.podspec' pod 'nSure' diff --git a/packages/mobile/ios/Podfile.lock b/packages/mobile/ios/Podfile.lock index 5e53c428636..f24f591cb36 100644 --- a/packages/mobile/ios/Podfile.lock +++ b/packages/mobile/ios/Podfile.lock @@ -2016,7 +2016,7 @@ DEPENDENCIES: - RNSVG (from `../node_modules/react-native-svg`) - RNZipArchive (from `../../../node_modules/react-native-zip-archive`) - "snap-kit-react-native (from `../../../node_modules/@snapchat/snap-kit-react-native`)" - - SRSRadialGradient (from `../node_modules/react-native-radial-gradient/ios`) + - SRSRadialGradient (from `../../../node_modules/react-native-radial-gradient/ios`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: @@ -2268,7 +2268,7 @@ EXTERNAL SOURCES: snap-kit-react-native: :path: "../../../node_modules/@snapchat/snap-kit-react-native" SRSRadialGradient: - :path: "../node_modules/react-native-radial-gradient/ios" + :path: "../../../node_modules/react-native-radial-gradient/ios" Yoga: :path: "../node_modules/react-native/ReactCommon/yoga" @@ -2408,6 +2408,6 @@ SPEC CHECKSUMS: TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 Yoga: 055f92ad73f8c8600a93f0e25ac0b2344c3b07e6 -PODFILE CHECKSUM: ca907d6a8cf6046d10a7f849792c3931d7ed8b66 +PODFILE CHECKSUM: 991e040b79c5e18ea6badc3b8e0115357b21a662 COCOAPODS: 1.15.2 diff --git a/packages/mobile/patches/react-native+0.74.6.patch b/packages/mobile/patches/react-native+0.74.6.patch deleted file mode 100644 index 87b19d08cd4..00000000000 --- a/packages/mobile/patches/react-native+0.74.6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/node_modules/react-native/Libraries/Animated/AnimatedEvent.js b/node_modules/react-native/Libraries/Animated/AnimatedEvent.js -index 7279c2a..d798b42 100644 ---- a/node_modules/react-native/Libraries/Animated/AnimatedEvent.js -+++ b/node_modules/react-native/Libraries/Animated/AnimatedEvent.js -@@ -251,6 +251,6 @@ export class AnimatedEvent { - } - - _callListeners = (...args: any) => { -- this._listeners.forEach(listener => listener(...args)); -+ this._listeners.forEach(listener => listener?.(...args)); - }; - } diff --git a/packages/mobile/patches/react-native-radial-gradient+1.1.4.patch b/packages/mobile/patches/react-native-radial-gradient+1.1.4.patch new file mode 100644 index 00000000000..6a9596843f1 --- /dev/null +++ b/packages/mobile/patches/react-native-radial-gradient+1.1.4.patch @@ -0,0 +1,19 @@ +diff --git a/node_modules/react-native-radial-gradient/index.js b/node_modules/react-native-radial-gradient/index.js +index 4be67fa..ea543dd 100644 +--- a/node_modules/react-native-radial-gradient/index.js ++++ b/node_modules/react-native-radial-gradient/index.js +@@ -5,7 +5,13 @@ import {ViewPropTypes} from 'deprecated-react-native-prop-types'; + + export default class RadialGradient extends Component { + static propTypes = { +- center: PropTypes.arrayOf(PropTypes.number), ++ center: PropTypes.oneOfType([ ++ PropTypes.arrayOf(PropTypes.number), ++ PropTypes.shape({ ++ x: PropTypes.number, ++ y: PropTypes.number ++ }) ++ ]), + colors: PropTypes.arrayOf(PropTypes.string), + stops: PropTypes.arrayOf(PropTypes.number), + radius: PropTypes.number, diff --git a/packages/mobile/src/harmony-native/components/Button/Button/Button.tsx b/packages/mobile/src/harmony-native/components/Button/Button/Button.tsx index 25563e7c9e1..6c52c2b53aa 100644 --- a/packages/mobile/src/harmony-native/components/Button/Button/Button.tsx +++ b/packages/mobile/src/harmony-native/components/Button/Button/Button.tsx @@ -274,7 +274,7 @@ export const Button = (props: ButtonProps) => { return ( { { return ( { style={[ style, animatedStyles, - { - textDecorationLine: showUnderline ? 'underline' : 'none' - } + { textDecorationLine: showUnderline ? 'underline' : 'none' } ]} > {children}