Catch up develop with Release v1.2.4 fixes (#359)

* Update fastfile and set release for Sentry (#356) * Fix app crash on open of ReceiveModal (#357) * Fix overlay asset screen in not native stack * upgrade deps + include deps needed for add cash * Fix app crash on open of ReceiveModal * Prevent undefined errors related to our usage of RecyclerListView * Fix native stacks for iOS version 13.3.1 Co-authored-by: Michał Osadnik <[email protected]> Co-authored-by: Bruno Barbieri <[email protected]> Co-authored-by: Michael Demarais <[email protected]> Co-authored-by: Michał Osadnik <[email protected]> Co-authored-by: Bruno Barbieri <[email protected]>
rainbow-me · Feb 12, 2020 · 531eb7e · 531eb7e
1 parent a32db3f
commit 531eb7e
Show file tree

Hide file tree

Showing 13 changed files with 255 additions and 180 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 ### Removed
 
 ### Changed
+
+## [1.2.4-1](https://github.com/rainbow-me/rainbow/releases/tag/v1.2.4-1)
+### Changed
+* Bugfixes for broken button animation
+* Performance improvements for network calls
+* Improved support for Sentry sourcemaps
+
 ## [1.2.3-1](https://github.com/rainbow-me/rainbow/releases/tag/v1.2.3-1)
 ### Changed
 * Better biometric support

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -285,13 +285,13 @@ PODS:
   - React-jsinspector (0.62.0-rc.1)
   - react-native-blur (0.8.0):
     - React
-  - react-native-camera (3.16.0):
+  - react-native-camera (3.17.0):
     - React
-    - react-native-camera/RCT (= 3.16.0)
-    - react-native-camera/RN (= 3.16.0)
-  - react-native-camera/RCT (3.16.0):
+    - react-native-camera/RCT (= 3.17.0)
+    - react-native-camera/RN (= 3.17.0)
+  - react-native-camera/RCT (3.17.0):
     - React
-  - react-native-camera/RN (3.16.0):
+  - react-native-camera/RN (3.17.0):
     - React
   - react-native-mail (4.1.0):
     - React
@@ -371,6 +371,8 @@ PODS:
     - React-cxxreact (= 0.62.0-rc.1)
     - React-jsi (= 0.62.0-rc.1)
     - ReactCommon/callinvoker (= 0.62.0-rc.1)
+  - ReactNativePayments (1.1.3):
+    - React
   - ReactNativePermissions (1.2.1):
     - React
   - RNAnalytics (1.1.0):
@@ -380,28 +382,28 @@ PODS:
     - React
   - RNCMaskedView (0.1.6):
     - React
-  - RNCPushNotificationIOS (1.0.5):
+  - RNCPushNotificationIOS (1.0.6):
     - React
   - RNDeviceInfo (5.3.1):
     - React
   - RNFastImage (7.0.2):
     - React
     - SDWebImage (~> 5.0)
     - SDWebImageWebPCoder (~> 0.2.3)
-  - RNFBApp (6.3.0):
+  - RNFBApp (6.3.2):
     - Firebase/Core (~> 6.13.0)
     - React
-  - RNFBCrashlytics (6.3.0):
+  - RNFBCrashlytics (6.3.2):
     - Crashlytics (~> 3.14.0)
     - Fabric (~> 1.10.2)
     - Firebase/Core (~> 6.13.0)
     - React
     - RNFBApp
-  - RNFBMessaging (6.3.0):
+  - RNFBMessaging (6.3.2):
     - Firebase/Messaging (~> 6.13.0)
     - React
     - RNFBApp
-  - RNGestureHandler (1.5.3):
+  - RNGestureHandler (1.5.6):
     - React
   - RNInputMask (4.1.0)
   - RNKeychain (4.0.3):
@@ -484,6 +486,7 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - ReactCommon/callinvoker (from `../node_modules/react-native/ReactCommon`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - "ReactNativePayments (from `../node_modules/@rainbow-me/react-native-payments/lib/ios`)"
   - ReactNativePermissions (from `../node_modules/react-native-permissions`)
   - "RNAnalytics (from `../node_modules/@segment/analytics-react-native`)"
   - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
@@ -614,6 +617,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/Vibration"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  ReactNativePayments:
+    :path: "../node_modules/@rainbow-me/react-native-payments/lib/ios"
   ReactNativePermissions:
     :path: "../node_modules/react-native-permissions"
   RNAnalytics:
@@ -705,7 +710,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: ccf2361cd90f691e04ff73585f099aa179ae8b52
   React-jsinspector: fabb3a8cad7bce396f2d4c29cbf83e87022b07ec
   react-native-blur: cad4d93b364f91e7b7931b3fa935455487e5c33c
-  react-native-camera: 705c7e9412436957b4dc894a1af61f43830787e2
+  react-native-camera: c549d50495c989688ef1819dab49441c7dc7c17d
   react-native-mail: a864fb211feaa5845c6c478a3266de725afdce89
   react-native-netinfo: 8884d510fe67349940b4399c01db3e3591c922aa
   react-native-randombytes: 3638d24759d67c68f6ccba60c52a7a8a8faa6a23
@@ -725,17 +730,18 @@ SPEC CHECKSUMS:
   React-RCTText: f2f9976b77661b5a1d628cf7ebfe6c08b6168f8a
   React-RCTVibration: 2e7618e869b2ba4a15042d6def29dd32df734793
   ReactCommon: 13c3473a975e73db91b1999e0d6d89c62400785d
+  ReactNativePayments: 56363b0ac491c96c8c98f3913860ee5568f061ae
   ReactNativePermissions: 7cfad56d13c8961cd2a1005b4955b1400c79ef3e
   RNAnalytics: 35a54cb740c472a0a6a3de765176b82cccc2d1ef
   RNCAsyncStorage: 44395cb9c7c1523104c2b499eb426ef7aff82bca
   RNCMaskedView: a88953beefbd347a29072d9eba90e42945fe291e
-  RNCPushNotificationIOS: 4a5c5d92ce51227f8c3409b0b7542382c0b5f008
+  RNCPushNotificationIOS: 05262c52fcfb861a2b79aa8e51cad66263c9ea52
   RNDeviceInfo: 6f20764111df002b4484f90cbe0a861be29bcc6c
   RNFastImage: 9b0c22643872bb7494c8d87bbbb66cc4c0d9e7a2
-  RNFBApp: ad3fbf3071c5ac5308e02b8dc21845f547976757
-  RNFBCrashlytics: c77c78a712a3f185b0b8193654c324fa3f939b55
-  RNFBMessaging: 6f2cc90155bea4fad1c7d74dfe0fa880d215c3fd
-  RNGestureHandler: 02905abe54e1f6e59c081a10b4bd689721e17aa6
+  RNFBApp: fc62d1e8adbc871fc7c27314c8e0842aebb44514
+  RNFBCrashlytics: eca9004e24f54b1edf32341c8809a157015fdeea
+  RNFBMessaging: 64114226de3857998b142ae893d54f326221e124
+  RNGestureHandler: 911d3b110a7a233a34c4f800e7188a84b75319c6
   RNInputMask: 815461ebdf396beb62cf58916c35cf6930adb991
   RNKeychain: f5783613aa3095af63345ddb9626a729bd4a3897
   RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
@@ -746,13 +752,13 @@ SPEC CHECKSUMS:
   RNSentry: 9cfa3717b1e6bf9ad4b124683e78e3b98b01d3af
   RNStoreReview: 62d6afd7c37db711a594bbffca6b0ea3a812b7a8
   RNSVG: 82d44baa568873faae1a9929dd30d29db8f06732
-  SDWebImage: 29c340dbdcef342bb13125553f4e19ce056b07a7
+  SDWebImage: 4d5c027c935438f341ed33dbac53ff9f479922ca
   SDWebImageWebPCoder: 947093edd1349d820c40afbd9f42acb6cdecd987
   Sentry: 14bdd673870e8cf64932b149fad5bbbf39a9b390
   SRSRadialGradient: 77bcb1ae812d0c77560e54ed9e52166df032db1d
   SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
   TcpSockets: 14306fb79f9750ea7d2ddd02d8bed182abb01797
-  ToolTipMenu: ad9f45c5ef375418275c81a667c2805bcac8692a
+  ToolTipMenu: 8ac61aded0fbc4acfe7e84a7d0c9479d15a9a382
   Yoga: b9a1f7189009fa4b6266ee0a63235547326295d2
 
 PODFILE CHECKSUM: 4e11b438fd6bb2763be24d82eeafc6f69c49a2f4

diff --git a/ios/Rainbow.xcodeproj/project.pbxproj b/ios/Rainbow.xcodeproj/project.pbxproj
@@ -269,8 +269,8 @@
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
-				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
 				13B07FB71A68108700A75B9A /* main.m */,
+				13B07FB11A68108700A75B9A /* LaunchScreen.xib */,
 				3CBE29CC2381E43900BE05AC /* Dummy.swift */,
 				3CBE29CB2381E43800BE05AC /* Rainbow-Bridging-Header.h */,
 				A4277D9E23CBD1910042BAF4 /* Extensions.swift */,
@@ -624,7 +624,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export SENTRY_PROPERTIES=sentry.properties\nexport NODE_ARGS=--max-old-space-size=2048\n../node_modules/@sentry/cli/bin/sentry-cli react-native xcode ../node_modules/react-native/scripts/react-native-xcode.sh\n";
+			shellScript = "export SENTRY_PROPERTIES=sentry.properties\nexport NODE_ARGS=--max-old-space-size=2048\nDEST=$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $DEST/main.jsbundle.map\"\n../node_modules/@sentry/cli/bin/sentry-cli react-native xcode  ../node_modules/react-native/scripts/react-native-xcode.sh\ncp $DEST/main.jsbundle* ../ios/\n";
 		};
 		3CF823D3218F310D0024B77B /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -734,10 +734,10 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = L74NQAQB8H;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
@@ -763,7 +763,7 @@
 					"\"$(SRCROOT)/Rainbow\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -791,9 +791,9 @@
 				CODE_SIGN_ENTITLEMENTS = Rainbow/Rainbow.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = L74NQAQB8H;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
@@ -819,7 +819,7 @@
 					"\"$(SRCROOT)/Rainbow\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -883,9 +883,9 @@
 				CODE_SIGN_ENTITLEMENTS = Rainbow/Rainbow.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = L74NQAQB8H;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
@@ -910,7 +910,7 @@
 					"\"$(SRCROOT)/Rainbow\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -975,9 +975,9 @@
 				CODE_SIGN_ENTITLEMENTS = Rainbow/Rainbow.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = L74NQAQB8H;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
@@ -1002,7 +1002,7 @@
 					"\"$(SRCROOT)/Rainbow\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
@@ -18,11 +18,26 @@ platform :ios do
     download_dsyms(version: "latest")
     upload_symbols_to_crashlytics
     sentry_upload_dsym
+    sentry_create_release(
+      finalize: true # Whether to finalize the release. If not provided or false, the release can be finalized using the sentry_finalize_release action
+    )
+    sentry_upload_sourcemap(
+      sourcemap: './main.jsbundle', # file to upload
+      rewrite: true
+    )
+    sentry_upload_sourcemap(
+      sourcemap: './main.jsbundle.map', # sourcemap to upload
+      rewrite: true
+    )
     clean_build_artifacts
   end
 
   desc "Submit a new Beta build to Apple TestFlight"
   lane :beta do
+    increment_build_number({
+      build_number: latest_testflight_build_number + 1
+    })
+
     update_info_plist(
       plist_path: "Rainbow/Info.plist",
       display_name: "Rainbow"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Rainbow",
-  "version": "1.2.3-1",
+  "version": "1.2.4-3",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -30,6 +30,7 @@
     "@hocs/omit-props": "^0.4.0",
     "@hocs/safe-timers": "^0.4.0",
     "@hocs/with-view-layout-props": "^0.2.0",
+    "@rainbow-me/react-native-payments": "^1.1.3",
     "@react-native-community/async-storage": "1.7.1",
     "@react-native-community/blur": "^3.4.1",
     "@react-native-community/masked-view": "^0.1.5",
@@ -98,7 +99,7 @@
     "react-native-dotenv": "^0.2.0",
     "react-native-emoji": "1.5.0",
     "react-native-fast-image": "andrewschenk-linx/react-native-fast-image#fix-ios-xcode-proj",
-    "react-native-gesture-handler": "1.5.3",
+    "react-native-gesture-handler": "1.5.6",
     "react-native-haptic-feedback": "^1.8.2",
     "react-native-indicators": "0.17.0",
     "react-native-ios11-devicecheck": "^0.0.3",
@@ -126,7 +127,7 @@
     "react-native-tab-view-viewpager-adapter": "^1.0.7",
     "react-native-tab-view": "^2.12.0",
     "react-native-tcp": "^3.3.2",
-    "react-native-text-input-mask": "waqas19921/react-native-text-input-mask",
+    "react-native-text-input-mask": "^2.0.0",
     "react-native-tooltip": "marcosrdz/react-native-tooltip#master",
     "react-native-udp": "^2.6.1",
     "react-native-version-number": "^0.3.6",
@@ -136,15 +137,15 @@
     "react-navigation-tabs": "2.6.2",
     "react-navigation-tabs-v1": "1.2.0",
     "react-primitives": "^0.8.0",
-    "react-redux": "^5.0.7",
+    "react-redux": "^7.1.3",
     "react-spring": "^5.7.2",
     "react-style-proptype": "^3.2.2",
     "readable-stream": "^1.0.33",
     "reanimated-bottom-sheet": "^1.0.0-alpha.18",
     "recompact": "^3.4.0",
     "recompose": "^0.30.0",
     "recyclerlistview": "2.0.12",
-    "redux": "^4.0.1",
+    "redux": "^4.0.5",
     "redux-devtools-extension": "^2.13.8",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",

diff --git a/src/App.js b/src/App.js
@@ -23,6 +23,7 @@ import RNIOS11DeviceCheck from 'react-native-ios11-devicecheck';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 // eslint-disable-next-line import/no-unresolved
 import { enableScreens } from 'react-native-screens';
+import VersionNumber from 'react-native-version-number';
 import { connect, Provider } from 'react-redux';
 import { compose, withProps } from 'recompact';
 import { FlexItem } from './components/layout';
@@ -55,7 +56,9 @@ if (__DEV__) {
 
 CodePush.getUpdateMetadata().then(update => {
   if (update) {
-    setRelease(update.appVersion + '-codepush:' + update.label);
+    setRelease(`me.rainbow-${update.appVersion}-codepush:${update.label}`);
+  } else {
+    setRelease(`me.rainbow-${VersionNumber.appVersion}`);
   }
 });
 

diff --git a/src/components/activity-list/RecyclerActivityList.js b/src/components/activity-list/RecyclerActivityList.js
@@ -194,6 +194,7 @@ export default class RecyclerActivityList extends PureComponent {
           scrollIndicatorInsets={{
             bottom: safeAreaInsetValues.bottom,
           }}
+          style={{ minHeight: 1 }}
         />
       </StickyContainer>
     </Wrapper>

diff --git a/src/components/asset-list/RecyclerAssetList.js b/src/components/asset-list/RecyclerAssetList.js
@@ -111,6 +111,8 @@ const hasRowChanged = (r1, r2) => {
   if (
     r1.item &&
     r2.item &&
+    r1.item.assets &&
+    r2.item.assets &&
     r1.item.smallBalancesContainer &&
     r2.item.smallBalancesContainer
   ) {

diff --git a/src/components/send/SendAssetList.js b/src/components/send/SendAssetList.js
@@ -227,6 +227,7 @@ class SendAssetList extends React.Component {
             this.componentHeight = event.nativeEvent.layoutMeasurement.height;
             this.position = event.nativeEvent.contentOffset.y;
           }}
+          style={{ minHeight: 1 }}
         />
       </FlyInAnimation>
     );

diff --git a/src/components/send/SendContactList.js b/src/components/send/SendContactList.js
@@ -157,6 +157,7 @@ class SendContactList extends Component {
             keyboardShouldPersistTaps: 'always',
           }}
           rowRenderer={this.renderItem}
+          style={{ minHeight: 1 }}
         />
       )}
     </FlyInAnimation>

diff --git a/src/helpers/isNativeStackAvailable.js b/src/helpers/isNativeStackAvailable.js
@@ -1,3 +1,3 @@
 import { Platform } from 'react-native';
 
-export default Platform.OS === 'ios' && Platform.Version >= 13;
+export default Platform.OS === 'ios' && parseFloat(Platform.Version) >= 13;