Merge pull request #1347 from jolocom/release/v1.6.0

Release/v1.6.0

.babelrc

@@ -11,4 +11,4 @@
       "extensions": ["ts"]
     }]
   ]
-}
+}

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,30 +1,40 @@
 ---
 name: Bug Report
 about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
 
 ---
 
-**Describe the bug**
+### Describe the bug
+
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+### To Reproduce
+
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+### Expected behavior
+
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+### Screenshots
+
 If applicable, add screenshots to help explain your problem.
 
-**Smartphone (please complete the following information):**
+### Smartphone (please complete the following information):
+
  - Device: [e.g. iPhone6]
  - OS: [e.g. iOS8.1]
  - Browser [e.g. stock browser, safari]
  - Version [e.g. 22]
 
-**Additional context**
+### Additional context
+
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature-implementation.md

@@ -1,16 +1,24 @@
 ---
 name: Feature Implementation
 about: Implementation Scope and Description
+title: ''
+labels: feature
+assignees: ''
 
 ---
 
-**What is the scope of the feature**
+### Scope of the feature
+
 A clear and concise description of what the feature will address
 
-**Enumerate the tasks that are needed to implement the feature**
+### Tasks
+
+*Enumerate the tasks that are needed to implement the feature*
+
 - [ ] subtask
 - [ ] subtask
 - [ ] subtask
 
-**Additional important information**
+### Additional important information
+
 Add any additonal important information which is connected to the feature

.github/ISSUE_TEMPLATE/general.md

@@ -1,6 +1,9 @@
 ---
 name: General
 about: What needs to be done
+title: ''
+labels: ''
+assignees: ''
 
 ---
 

README.md

@@ -71,4 +71,4 @@ Documentation
 -------------
 Additional documentation can be found at our [wiki](https://github.com/jolocom/smartwallet-app/wiki).
 
-Copyright (C) 2014-2018  JOLOCOM GmbH
+Copyright (C) 2014-2019  JOLOCOM GmbH

android/app/build.gradle

@@ -102,8 +102,8 @@ android {
         applicationId "com.jolocomwallet"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 16
-        versionName "1.5.0"
+        versionCode 17
+        versionName "1.6.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
@@ -150,6 +150,7 @@ android {
 }
 
 dependencies {
+    compile project(':react-native-version-number')
     compile project(':react-native-languages')
     compile project(':react-native-randombytes')
     compile project(':react-native-vector-icons')

android/app/src/main/java/com/jolocomwallet/MainApplication.java

@@ -3,6 +3,7 @@
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
+import com.apsl.versionnumber.RNVersionNumberPackage;
 import com.reactcommunity.rnlanguages.RNLanguagesPackage;
 import com.bitgo.randombytes.RandomBytesPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
@@ -39,6 +40,7 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new RNVersionNumberPackage(),
             new RNLanguagesPackage(),
             new RandomBytesPackage(),
             new VectorIconsPackage(),

android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'jolocomwallet'
+include ':react-native-version-number'
+project(':react-native-version-number').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-version-number/android')
 include ':react-native-languages'
 project(':react-native-languages').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-languages/android')
 include ':react-native-randombytes'

bin/generateTerms.ts

@@ -0,0 +1,11 @@
+import strings from '../src/locales/strings'
+import { writeFileSync } from 'fs'
+
+const en = {}
+
+Object.keys(strings)
+  .sort()
+  .forEach(key => (en[strings[key]] = strings[key]))
+
+const path = __dirname + '/../src/locales/en.json'
+writeFileSync(path, JSON.stringify(en, null, 2), { flag: 'w' })

ios/smartwallet.xcodeproj/project.pbxproj

@@ -5,7 +5,6 @@
 	};
 	objectVersion = 46;
 	objects = {
-
 /* Begin PBXBuildFile section */
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
 		00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
@@ -25,6 +24,7 @@
 		23238968F2BA48C4A9BB4AC4 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 640439B9112A41768C633964 /* Foundation.ttf */; };
 		28B670DA172F46598B3D5E4B /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 853CE29A4ED949C79BF46AF4 /* SimpleLineIcons.ttf */; };
 		296C5B93DD624867B8F0966B /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E247948545D24BE58E811111 /* MaterialIcons.ttf */; };
+		2C4C73F9D1194547BBD589E3 /* libRNVersionNumber.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64B87D43A313485EB3520460 /* libRNVersionNumber.a */; };
 		4BF187ACD94048C79892D747 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3D9BCA202C9047859CCE2A1B /* Ionicons.ttf */; };
 		4D64A0CFA79C40748565CDF5 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9393C6FEDE02408C97050CBA /* libRNVectorIcons.a */; };
 		54CAEABDB21B40C19D55C5CE /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2AFA3F2DBECD4F52A9425B23 /* Feather.ttf */; };
@@ -327,6 +327,20 @@
 			remoteGlobalIDString = 358F4ED71D1E81A9004DF814;
 			remoteInfo = RCTBlob;
 		};
+		B4B543C12298234E002944F4 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 10DF72DE13E94336B6D1DA7E /* RNVersionNumber.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 134814201AA4EA6300B7C361;
+			remoteInfo = RNVersionNumber;
+		};
+		B4B543C32298234E002944F4 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 10DF72DE13E94336B6D1DA7E /* RNVersionNumber.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2858ECD01F8B91B400610575;
+			remoteInfo = "RNVersionNumber-tvOS";
+		};
 		DC46523220A1D5D2000515C9 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = E4B7FA621F764080A23F67F9 /* RNCamera.xcodeproj */;
@@ -449,6 +463,7 @@
 		00E356EE1AD99517003FC87E /* smartwalletTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = smartwalletTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* smartwalletTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = smartwalletTests.m; sourceTree = "<group>"; };
+		10DF72DE13E94336B6D1DA7E /* RNVersionNumber.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVersionNumber.xcodeproj; path = "../node_modules/react-native-version-number/ios/RNVersionNumber.xcodeproj"; sourceTree = "<group>"; };
 		139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; };
 		139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* smartwallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = smartwallet.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -474,6 +489,7 @@
 		5680E6CFCB924E788BB7FC2C /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
 		5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = "<group>"; };
 		640439B9112A41768C633964 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
+		64B87D43A313485EB3520460 /* libRNVersionNumber.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVersionNumber.a; sourceTree = "<group>"; };
 		77F057F262F14D45AA1DBBE8 /* libRNFetchBlob.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFetchBlob.a; sourceTree = "<group>"; };
 		78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
 		7F6B1D8837CC457889388E57 /* ReactNativePermissions.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativePermissions.xcodeproj; path = "../node_modules/react-native-permissions/ios/ReactNativePermissions.xcodeproj"; sourceTree = "<group>"; };
@@ -540,6 +556,7 @@
 				4D64A0CFA79C40748565CDF5 /* libRNVectorIcons.a in Frameworks */,
 				F47B6A88E4754685952B54A9 /* libReactNativePermissions.a in Frameworks */,
 				13739399034E4271864C3DDB /* libRNRandomBytes.a in Frameworks */,
+				2C4C73F9D1194547BBD589E3 /* libRNVersionNumber.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -733,6 +750,7 @@
 				5680E6CFCB924E788BB7FC2C /* RNVectorIcons.xcodeproj */,
 				7F6B1D8837CC457889388E57 /* ReactNativePermissions.xcodeproj */,
 				CAF102D56DB146639EF6CC66 /* RNRandomBytes.xcodeproj */,
+				10DF72DE13E94336B6D1DA7E /* RNVersionNumber.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -783,6 +801,15 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		B4B543BD2298234E002944F4 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				B4B543C22298234E002944F4 /* libRNVersionNumber.a */,
+				B4B543C42298234E002944F4 /* libRNVersionNumber-tvOS.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		DC4651FF20A1D5D1000515C9 /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
@@ -793,6 +820,7 @@
 				9393C6FEDE02408C97050CBA /* libRNVectorIcons.a */,
 				2F64871E059A476B8EAF29A5 /* libReactNativePermissions.a */,
 				ABE391BA79A149EE8D5553B3 /* libRNRandomBytes.a */,
+				64B87D43A313485EB3520460 /* libRNVersionNumber.a */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
@@ -1049,6 +1077,10 @@
 					ProductGroup = DC46520A20A1D5D2000515C9 /* Products */;
 					ProjectRef = 5680E6CFCB924E788BB7FC2C /* RNVectorIcons.xcodeproj */;
 				},
+				{
+					ProductGroup = B4B543BD2298234E002944F4 /* Products */;
+					ProjectRef = 10DF72DE13E94336B6D1DA7E /* RNVersionNumber.xcodeproj */;
+				},
 				{
 					ProductGroup = DCBEC41A20CABE240099FD03 /* Products */;
 					ProjectRef = DCBEC41920CABE240099FD03 /* SplashScreen.xcodeproj */;
@@ -1333,6 +1365,20 @@
 			remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		B4B543C22298234E002944F4 /* libRNVersionNumber.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRNVersionNumber.a;
+			remoteRef = B4B543C12298234E002944F4 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		B4B543C42298234E002944F4 /* libRNVersionNumber-tvOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libRNVersionNumber-tvOS.a";
+			remoteRef = B4B543C32298234E002944F4 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		DC46523320A1D5D2000515C9 /* libRNCamera.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1562,13 +1608,15 @@
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-permissions/ios/**",
 					"$(SRCROOT)/../node_modules/react-native-randombytes",
+					"$(SRCROOT)/../node_modules/react-native-version-number/ios",
 				);
 				INFOPLIST_FILE = smartwalletTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1599,13 +1647,15 @@
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-permissions/ios/**",
 					"$(SRCROOT)/../node_modules/react-native-randombytes",
+					"$(SRCROOT)/../node_modules/react-native-version-number/ios",
 				);
 				INFOPLIST_FILE = smartwalletTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -1637,6 +1687,7 @@
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-permissions/ios/**",
 					"$(SRCROOT)/../node_modules/react-native-randombytes",
+					"$(SRCROOT)/../node_modules/react-native-version-number/ios",
 				);
 				"HEADER_SEARCH_PATHS[arch=*]" = "$(SRCROOT)/../node_modules/react-native-splash-screen/ios";
 				INFOPLIST_FILE = smartwallet/Info.plist;
@@ -1672,6 +1723,7 @@
 					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
 					"$(SRCROOT)/../node_modules/react-native-permissions/ios/**",
 					"$(SRCROOT)/../node_modules/react-native-randombytes",
+					"$(SRCROOT)/../node_modules/react-native-version-number/ios",
 				);
 				"HEADER_SEARCH_PATHS[arch=*]" = "$(SRCROOT)/../node_modules/react-native-splash-screen/ios";
 				INFOPLIST_FILE = smartwallet/Info.plist;

ios/smartwallet/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.0</string>
+	<string>1.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSApplicationCategoryType</key>
-	<string></string>
+	<string/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>