From f42011afa47ed2ef1da13087f4e4b805c6712b44 Mon Sep 17 00:00:00 2001 From: jinchung Date: Thu, 4 Apr 2019 20:04:31 -0400 Subject: [PATCH 01/11] updating rainbow-common version --- package.json | 4 ++-- yarn.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 2b74a4fd8f5..421a69cbe2e 100644 --- a/package.json +++ b/package.json @@ -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.39", "@tradle/react-native-http": "^2.0.0", "assert": "^1.4.1", "axios": "^0.18.0", @@ -196,4 +196,4 @@ "./src/assets/fonts" ] } -} +} \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 72421b351ce..3b3f6956f62 100644 --- a/yarn.lock +++ b/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.39": + version "0.6.39" + resolved "https://registry.yarnpkg.com/@rainbow-me/rainbow-common/-/rainbow-common-0.6.39.tgz#d92e29c00d265668a84af6193d671b18f63b27c5" dependencies: axios "^0.18.0" bignumber.js "^7.0.1" From 8f14077d83c6ef408647f26ab61295953a2c5570 Mon Sep 17 00:00:00 2001 From: jinchung Date: Thu, 4 Apr 2019 20:06:29 -0400 Subject: [PATCH 02/11] required usage tag --- ios/Rainbow/Info.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/Rainbow/Info.plist b/ios/Rainbow/Info.plist index 01536b0f1b0..6076a84a628 100644 --- a/ios/Rainbow/Info.plist +++ b/ios/Rainbow/Info.plist @@ -45,6 +45,8 @@ Rainbow NSCalendarsUsageDescription Rainbow + NSLocationAlwaysUsageDescription + Rainbow NSCameraUsageDescription Used to scan QR codes NSFaceIDUsageDescription From 3e612c10683e0c246d234f9b14afb7ffe24b1808 Mon Sep 17 00:00:00 2001 From: jinchung Date: Thu, 4 Apr 2019 21:55:16 -0400 Subject: [PATCH 03/11] updated common version --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 421a69cbe2e..df129a4158c 100644 --- a/package.json +++ b/package.json @@ -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.39", + "@rainbow-me/rainbow-common": "^0.6.40", "@tradle/react-native-http": "^2.0.0", "assert": "^1.4.1", "axios": "^0.18.0", diff --git a/yarn.lock b/yarn.lock index 3b3f6956f62..d0f88569b77 100644 --- a/yarn.lock +++ b/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.39": - version "0.6.39" - resolved "https://registry.yarnpkg.com/@rainbow-me/rainbow-common/-/rainbow-common-0.6.39.tgz#d92e29c00d265668a84af6193d671b18f63b27c5" +"@rainbow-me/rainbow-common@^0.6.40": + version "0.6.40" + resolved "https://registry.yarnpkg.com/@rainbow-me/rainbow-common/-/rainbow-common-0.6.40.tgz#e5c07e55dacc3cc77383e3de690c11da83a1b0d8" dependencies: axios "^0.18.0" bignumber.js "^7.0.1" From f00f4df43c7664364ff9bec4fd09a815b08eef99 Mon Sep 17 00:00:00 2001 From: jinchung Date: Fri, 5 Apr 2019 12:31:42 -0400 Subject: [PATCH 04/11] fix for incorrect row rendering in activity recycler list --- src/components/activity-list/RecyclerActivityList.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/activity-list/RecyclerActivityList.js b/src/components/activity-list/RecyclerActivityList.js index bda497f1b0f..4a82a995e46 100644 --- a/src/components/activity-list/RecyclerActivityList.js +++ b/src/components/activity-list/RecyclerActivityList.js @@ -117,6 +117,9 @@ export default class RecyclerActivityList extends Component { if (type === ViewTypes.FOOTER) { return ; } + if (!data) { + return null; + } if (!data.hash) { return ; } From 0b79b413e4b2984d5053fba8a294b4670e7261a2 Mon Sep 17 00:00:00 2001 From: jinchung Date: Fri, 5 Apr 2019 12:55:09 -0400 Subject: [PATCH 05/11] fix for displaying notification when app in closed state --- src/App.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/App.js b/src/App.js index 9dc4a7d9530..0160b25c0a3 100644 --- a/src/App.js +++ b/src/App.js @@ -129,6 +129,9 @@ class App extends Component { const notificationOpen = await firebase.notifications().getInitialNotification(); if (!notificationOpen) { this.fetchAllRequestsFromWalletConnectSessions(); + } else { + const { callId, sessionId } = notificationOpen.notification.data; + this.onPushNotificationOpened(callId, sessionId, false); } return walletAddress; } catch (error) { From b239f52a6214754da5cfd2ff8f99f4552de1d1b9 Mon Sep 17 00:00:00 2001 From: jinchung Date: Fri, 5 Apr 2019 14:22:52 -0400 Subject: [PATCH 06/11] picking up notifications --- src/App.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/App.js b/src/App.js index 0160b25c0a3..503dfeb3a31 100644 --- a/src/App.js +++ b/src/App.js @@ -127,12 +127,11 @@ class App extends Component { console.log('Unable to init all WalletConnect sessions'); } const notificationOpen = await firebase.notifications().getInitialNotification(); - if (!notificationOpen) { - this.fetchAllRequestsFromWalletConnectSessions(); - } else { + 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.'); @@ -189,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.'); + } } } } From 2781e96cd06b9ba3c6d542e48ef72c972ac0e70d Mon Sep 17 00:00:00 2001 From: jinchung Date: Fri, 5 Apr 2019 16:30:09 -0400 Subject: [PATCH 07/11] updating common version --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index df129a4158c..f957a594126 100644 --- a/package.json +++ b/package.json @@ -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.40", + "@rainbow-me/rainbow-common": "^0.6.41", "@tradle/react-native-http": "^2.0.0", "assert": "^1.4.1", "axios": "^0.18.0", diff --git a/yarn.lock b/yarn.lock index d0f88569b77..4710de7b2d7 100644 --- a/yarn.lock +++ b/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.40": - version "0.6.40" - resolved "https://registry.yarnpkg.com/@rainbow-me/rainbow-common/-/rainbow-common-0.6.40.tgz#e5c07e55dacc3cc77383e3de690c11da83a1b0d8" +"@rainbow-me/rainbow-common@^0.6.41": + version "0.6.41" + resolved "https://registry.yarnpkg.com/@rainbow-me/rainbow-common/-/rainbow-common-0.6.41.tgz#218df1c7bec227050fbd2eea4119930bc9648e87" dependencies: axios "^0.18.0" bignumber.js "^7.0.1" From 73cae2a73f51d8766e48c204e86fe6b7caf3244c Mon Sep 17 00:00:00 2001 From: jinchung Date: Fri, 5 Apr 2019 23:02:21 -0400 Subject: [PATCH 08/11] language update --- src/components/AddFundsInterstitial.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/AddFundsInterstitial.js b/src/components/AddFundsInterstitial.js index 8b7346d034d..5d952dad81f 100644 --- a/src/components/AddFundsInterstitial.js +++ b/src/components/AddFundsInterstitial.js @@ -62,7 +62,7 @@ const AddFundsInterstitial = ({ Import Wallet - Use your 12 or 24 word seed phrase from an existing wallet. + Use your 12 to 24 word seed phrase from an existing wallet. From 5e87b57c4852dcf1603a0fe31809819ebbc71019 Mon Sep 17 00:00:00 2001 From: jinchung Date: Mon, 8 Apr 2019 13:04:08 -0400 Subject: [PATCH 09/11] updating common version --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f957a594126..56cebab4978 100644 --- a/package.json +++ b/package.json @@ -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.41", + "@rainbow-me/rainbow-common": "^0.6.42", "@tradle/react-native-http": "^2.0.0", "assert": "^1.4.1", "axios": "^0.18.0", diff --git a/yarn.lock b/yarn.lock index 4710de7b2d7..287c1367e60 100644 --- a/yarn.lock +++ b/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.41": - version "0.6.41" - resolved "https://registry.yarnpkg.com/@rainbow-me/rainbow-common/-/rainbow-common-0.6.41.tgz#218df1c7bec227050fbd2eea4119930bc9648e87" +"@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" From b2ccf86eeea04a4c8c05ece72b61c4db5a3f46ff Mon Sep 17 00:00:00 2001 From: jinchung Date: Mon, 8 Apr 2019 13:20:38 -0400 Subject: [PATCH 10/11] updating build version --- ios/Rainbow/Info.plist | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Rainbow/Info.plist b/ios/Rainbow/Info.plist index 6076a84a628..f8f152abe45 100644 --- a/ios/Rainbow/Info.plist +++ b/ios/Rainbow/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.0.1 + 0.4.0 CFBundleSignature ???? CFBundleVersion - 2 + 1 CodePushDeploymentKey $(CODEPUSH_KEY) ITSAppUsesNonExemptEncryption @@ -45,12 +45,12 @@ Rainbow NSCalendarsUsageDescription Rainbow - NSLocationAlwaysUsageDescription - Rainbow NSCameraUsageDescription Used to scan QR codes NSFaceIDUsageDescription Used to sign transactions + NSLocationAlwaysUsageDescription + Rainbow NSLocationWhenInUseUsageDescription Rainbow NSMicrophoneUsageDescription From e86ed1724218f31706d29048cf8b8358d257ac88 Mon Sep 17 00:00:00 2001 From: jinchung Date: Tue, 9 Apr 2019 14:35:24 -0400 Subject: [PATCH 11/11] updated changelog --- CHANGELOG.md | 5 +++++ package.json | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da13b13fb28..a70de46de7c 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/package.json b/package.json index 56cebab4978..a0bd91e14c4 100644 --- a/package.json +++ b/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", @@ -196,4 +196,4 @@ "./src/assets/fonts" ] } -} \ No newline at end of file +}