Skip to content

Commit 10a0a9a

Browse files
hawkriveshawkrives
authored
Merge pull request #2083 from StoDevX/greenkeeper/react-native-0.52.0
Update react-native to the latest version 🚀
2 parents dfc041a + 609e1e6 commit 10a0a9a

File tree

14 files changed

+94
-93
lines changed

14 files changed

+94
-93
lines changed

‎.flowconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ suppress_type=$FlowFixMeProps
5050
suppress_type=$FlowFixMeState
5151
suppress_type=$FixMe
5252

53-
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
54-
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
53+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(6[0-1]\\|[1-5][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
54+
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(6[0-1]\\|[1-5][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
5555
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
5656
suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
5757

5858
unsafe.enable_getters_and_setters=true
5959

6060
[version]
61-
^0.57.0
61+
^0.61.0

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@
7575
"moment-timezone": "0.5.14",
7676
"p-retry": "1.0.0",
7777
"querystring": "0.2.0",
78-
"react": "16.0.0",
78+
"react": "16.2.0",
7979
"react-markdown": "2.5.1",
80-
"react-native": "0.51.0",
80+
"react-native": "0.52.0",
8181
"react-native-button": "2.2.0",
8282
"react-native-calendar-events": "1.4.3",
8383
"react-native-communications": "2.2.1",
@@ -124,7 +124,7 @@
124124
"eslint-plugin-flowtype": "2.41.0",
125125
"eslint-plugin-react": "7.5.1",
126126
"eslint-plugin-react-native": "3.2.0",
127-
"flow-bin": "0.57.3",
127+
"flow-bin": "0.61.0",
128128
"jest": "22.0.6",
129129
"jest-junit": "3.4.1",
130130
"js-yaml": "3.10.0",
@@ -136,7 +136,7 @@
136136
"pretty-bytes": "4.0.2",
137137
"pretty-quick": "1.2.0",
138138
"prop-types": "15.6.0",
139-
"react-test-renderer": "16.1.0",
139+
"react-test-renderer": "16.2.0",
140140
"simple-plist": "0.2.1",
141141
"string-natural-compare": "2.0.2",
142142
"strip-ansi": "4.0.0",

‎source/flux/parts/sis.js‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,8 @@
33
import {type ReduxState} from '../index'
44
import {getBalances, type BalancesShapeType} from '../../lib/financials'
55

6-
const UPDATE_OLE_DOLLARS = 'sis/UPDATE_OLE_DOLLARS'
7-
const UPDATE_FLEX_DOLLARS = 'sis/UPDATE_FLEX_DOLLARS'
8-
const UPDATE_PRINT_DOLLARS = 'sis/UPDATE_PRINT_DOLLARS'
96
const UPDATE_BALANCES_SUCCESS = 'sis/UPDATE_BALANCES_SUCCESS'
107
const UPDATE_BALANCES_FAILURE = 'sis/UPDATE_BALANCES_FAILURE'
11-
const UPDATE_MEALS_DAILY = 'sis/UPDATE_MEALS_DAILY'
12-
const UPDATE_MEALS_WEEKLY = 'sis/UPDATE_MEALS_WEEKLY'
13-
const UPDATE_MEAL_PLAN = 'sis/UPDATE_MEAL_PLAN'
148

159
type UpdateBalancesSuccessAction = {|
1610
type: 'sis/UPDATE_BALANCES_SUCCESS',
@@ -67,19 +61,6 @@ const initialState = {
6761
}
6862
export function sis(state: State = initialState, action: Action) {
6963
switch (action.type) {
70-
case UPDATE_OLE_DOLLARS:
71-
return {...state, oleBalance: action.payload.balance}
72-
case UPDATE_FLEX_DOLLARS:
73-
return {...state, flexBalance: action.payload.balance}
74-
case UPDATE_PRINT_DOLLARS:
75-
return {...state, printBalance: action.payload.balance}
76-
case UPDATE_MEALS_DAILY:
77-
return {...state, mealsRemainingToday: action.payload.mealsRemaining}
78-
case UPDATE_MEALS_WEEKLY:
79-
return {...state, mealsRemainingThisWeek: action.payload.mealsRemaining}
80-
case UPDATE_MEAL_PLAN:
81-
return {...state, mealPlanDescription: action.payload.mealPlan}
82-
8364
case UPDATE_BALANCES_FAILURE:
8465
return {...state, balancesErrorMessage: action.payload.message}
8566
case UPDATE_BALANCES_SUCCESS: {

‎source/views/building-hours/detail/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type Props = TopLevelViewPropsType & {
1515
type State = {intervalId: number, now: moment}
1616

1717
export class BuildingHoursDetailView extends React.PureComponent<Props, State> {
18-
static navigationOptions = ({navigation}) => {
18+
static navigationOptions = ({navigation}: any) => {
1919
const building = navigation.state.params.building
2020
return {
2121
title: building.name,

‎source/views/calendar/event-detail.android.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ type State = {
101101
}
102102

103103
export class EventDetail extends React.PureComponent<Props, State> {
104-
static navigationOptions = ({navigation}) => {
104+
static navigationOptions = ({navigation}: any) => {
105105
const {event} = navigation.state.params
106106
return {
107107
title: event.title,

‎source/views/calendar/event-detail.ios.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ type State = {
7373
}
7474

7575
export class EventDetail extends React.PureComponent<Props, State> {
76-
static navigationOptions = ({navigation}) => {
76+
static navigationOptions = ({navigation}: any) => {
7777
const {event} = navigation.state.params
7878
return {
7979
title: event.title,

‎source/views/contacts/contact-detail.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function promptCall(buttonText: string, phoneNumber: string) {
4949
type Props = {navigation: {state: {params: {contact: ContactType}}}}
5050

5151
export class ContactsDetailView extends React.PureComponent<Props> {
52-
static navigationOptions = ({navigation}) => {
52+
static navigationOptions = ({navigation}: any) => {
5353
return {
5454
title: navigation.state.params.contact.title,
5555
}

‎source/views/dictionary/detail.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ type Props = {
3434
}
3535

3636
export class DictionaryDetailView extends React.PureComponent<Props> {
37-
static navigationOptions = ({navigation}) => {
37+
static navigationOptions = ({navigation}: any) => {
3838
return {
3939
title: navigation.state.params.item.word,
4040
}

‎source/views/sis/student-work/detail.android.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ type Props = {
138138
}
139139

140140
export class JobDetailView extends React.PureComponent<Props> {
141-
static navigationOptions = ({navigation}) => {
141+
static navigationOptions = ({navigation}: any) => {
142142
const {job} = navigation.state.params
143143
return {
144144
title: job.title,

‎source/views/sis/student-work/detail.ios.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ type Props = {
131131
}
132132

133133
export class JobDetailView extends React.PureComponent<Props> {
134-
static navigationOptions = ({navigation}) => {
134+
static navigationOptions = ({navigation}: any) => {
135135
const {job} = navigation.state.params
136136
return {
137137
title: job.title,

0 commit comments

Comments
 (0)