Merge pull request #9 from coingrig/develop

Develop
coingrig · Jan 6, 2022 · 0f32517 · 0f32517
2 parents 8fe3a8e + 15d5595
commit 0f32517
Show file tree

Hide file tree

Showing 5 changed files with 129 additions and 85 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -134,8 +134,8 @@ android {
         applicationId "com.coingrig"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 40
-        versionName "1.3.3"
+        versionCode 41
+        versionName "1.3.4"
         missingDimensionStrategy 'react-native-camera', 'general'
 
     }

diff --git a/ios/Coingrig.xcodeproj/project.pbxproj b/ios/Coingrig.xcodeproj/project.pbxproj
@@ -637,7 +637,7 @@
 				CODE_SIGN_ENTITLEMENTS = Coingrig/Coingrig.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 41;
 				DEVELOPMENT_TEAM = L63HFFVTBZ;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -714,7 +714,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.3;
+				MARKETING_VERSION = 1.3.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -739,7 +739,7 @@
 				CODE_SIGN_ENTITLEMENTS = Coingrig/Coingrig.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution: Qubevo Sourcing SRL (L63HFFVTBZ)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 41;
 				DEVELOPMENT_TEAM = L63HFFVTBZ;
 				"HEADER_SEARCH_PATHS[arch=*]" = (
 					"$(inherited)",
@@ -815,7 +815,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.3.3;
+				MARKETING_VERSION = 1.3.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/ios/Coingrig/LaunchScreen.storyboard b/ios/Coingrig/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina6_1" orientation="portrait" appearance="dark"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coingrig",
-  "version": "1.3.1",
+  "version": "1.3.4",
   "private": true,
   "scripts": {
     "android": "npx react-native run-android",
@@ -24,7 +24,7 @@
     "url": "git+https://github.com/coingrig/coingrig-wallet.git"
   },
   "dependencies": {
-    "@coingrig/core": "1.3.1",
+    "@coingrig/core": "1.3.2",
     "@haskkor/react-native-pincode": "1.22.6",
     "@rainbow-me/animated-charts": "1.0.0-alpha.5",
     "@react-native-async-storage/async-storage": "1.15.7",