Merge pull request #53 from rainbow-me/develop

Release v0.4.0 (2)

CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 ### Added
 
 ### Changed
+* Fix for app crashing when low ETH after having a previous wallet with enough ETH
+* Fix for push notification not showing up when app completely closed
+* Updated paging logic for transaction history
+* Remove dropped/replaced transactions from pending state
+* Fix crash that occurs when touching blank activity list below profile masthead while transactions still loading
 
 ### Removed
 

ios/Rainbow/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.1</string>
+	<string>0.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>1</string>
 	<key>CodePushDeploymentKey</key>
 	<string>$(CODEPUSH_KEY)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
@@ -49,6 +49,8 @@
 	<string>Used to scan QR codes</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Used to sign transactions</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Rainbow</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Rainbow</string>
 	<key>NSMicrophoneUsageDescription</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Rainbow",
-  "version": "0.4.0-1",
+  "version": "0.4.0-2",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -15,7 +15,7 @@
     "@hocs/omit-props": "^0.4.0",
     "@hocs/safe-timers": "^0.4.0",
     "@hocs/with-view-layout-props": "^0.2.0",
-    "@rainbow-me/rainbow-common": "^0.6.38",
+    "@rainbow-me/rainbow-common": "^0.6.42",
     "@tradle/react-native-http": "^2.0.0",
     "assert": "^1.4.1",
     "axios": "^0.18.0",

src/App.js

@@ -127,9 +127,11 @@ class App extends Component {
         console.log('Unable to init all WalletConnect sessions');
       }
       const notificationOpen = await firebase.notifications().getInitialNotification();
-      if (!notificationOpen) {
-        this.fetchAllRequestsFromWalletConnectSessions();
+      if (notificationOpen) {
+        const { callId, sessionId } = notificationOpen.notification.data;
+        this.onPushNotificationOpened(callId, sessionId, false);
       }
+      this.fetchAllRequestsFromWalletConnectSessions();
       return walletAddress;
     } catch (error) {
       AlertIOS.alert('Error: Failed to initialize wallet.');
@@ -186,7 +188,12 @@ class App extends Component {
       if (transaction) {
         this.handleOpenConfirmTransactionModal(transaction, autoOpened);
       } else {
-        AlertIOS.alert('This request has expired.');
+        const fetchedTransaction = this.props.transactionIfExists(callId);
+        if (fetchedTransaction) {
+          this.handleOpenConfirmTransactionModal(fetchedTransaction, autoOpened);
+        } else {
+          AlertIOS.alert('This request has expired.');
+        }
       }
     }
   }

src/components/AddFundsInterstitial.js

@@ -62,7 +62,7 @@ const AddFundsInterstitial = ({
         Import Wallet
       </Button>
       <Paragraph>
-        Use your 12 or 24 word seed phrase from an existing wallet.
+        Use your 12 to 24 word seed phrase from an existing wallet.
       </Paragraph>
     </ButtonContainer>
   </Container>

src/components/activity-list/RecyclerActivityList.js

@@ -117,6 +117,9 @@ export default class RecyclerActivityList extends Component {
     if (type === ViewTypes.FOOTER) {
       return <ListFooter/>;
     }
+    if (!data) {
+      return null;
+    }
     if (!data.hash) {
       return <RequestCoinRow item={data} />;
     }

yarn.lock

@@ -665,9 +665,9 @@
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
 
-"@rainbow-me/rainbow-common@^0.6.38":
-  version "0.6.38"
-  resolved "https://registry.yarnpkg.com/@rainbow-me/rainbow-common/-/rainbow-common-0.6.38.tgz#ebbb00bd240a818765de6383d3031f519b06b968"
+"@rainbow-me/rainbow-common@^0.6.42":
+  version "0.6.42"
+  resolved "https://registry.yarnpkg.com/@rainbow-me/rainbow-common/-/rainbow-common-0.6.42.tgz#da46321faf60017fd730d349877ae4453f8f75e3"
   dependencies:
     axios "^0.18.0"
     bignumber.js "^7.0.1"