Merge pull request #259 from MOPCON/develop

chnbohwr · web-flow · commit 27f30c472d06 · 2019-10-08T23:04:08.000+08:00
release v3.1.1
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -132,8 +132,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled true
-        versionCode 20231
-        versionName "3.1.0"
+        versionCode 20232
+        versionName "3.1.1"
         missingDimensionStrategy 'react-native-camera', 'general'
     }
     signingConfigs {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MOPCON",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
diff --git a/src/containers/Reward/style.js b/src/containers/Reward/style.js
@@ -10,7 +10,6 @@ export const RewardContainer = styled.View`
 `;
 
 export const RewardCard = styled.View`
-  height: 168px;
   border: 1px solid ${scheduleCardTypeColor};
   border-radius: 6px;
   padding: 16px 20px;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "MOPCON",`
`3`		`- "version": "3.1.0",`
	`3`	`+ "version": "3.1.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"start": "node node_modules/react-native/local-cli/cli.js start",`