Merge pull request #174 from VerusCoin/dev

v1.0.14
VerusCoin · Jul 31, 2024 · f13e5f0 · f13e5f0
2 parents 63f248d + b2ab2fb
commit f13e5f0
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -4,7 +4,7 @@ import com.android.build.OutputFile
 
 def versionMajor = 1
 def versionMinor = 0
-def versionRevision = 13
+def versionRevision = 14
 def versionBuild = 0
 
 def keystorePropertiesFile = rootProject.file("keystore.properties");

diff --git a/env/main.android.json b/env/main.android.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.13",
+  "APP_VERSION": "1.0.14",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/env/main.ios.json b/env/main.ios.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.13",
+  "APP_VERSION": "1.0.14",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/ios/assets/env/main.json b/ios/assets/env/main.json
@@ -1,5 +1,5 @@
 {
-  "APP_VERSION": "1.0.13",
+  "APP_VERSION": "1.0.14",
   "ELECTRUM_PROTOCOL_CHANGE": 1.4,
 
   "KEY_DERIVATION_VERSION": 1,

diff --git a/ios/verusMobile.xcodeproj/project.pbxproj b/ios/verusMobile.xcodeproj/project.pbxproj
@@ -721,7 +721,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.13;
+				MARKETING_VERSION = 1.0.14;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile;
 				PRODUCT_NAME = verusmobile;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -792,7 +792,7 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-webview\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/rn-fetch-blob\"",
 				);
-				MARKETING_VERSION = 1.0.13;
+				MARKETING_VERSION = 1.0.14;
 				PRODUCT_BUNDLE_IDENTIFIER = org.reactjs.native.verusmobile;
 				PRODUCT_NAME = verusmobile;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "verusmobile",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "private": true,
   "scripts": {
     "postinstall": "./node_modules/.bin/rn-nodeify --hack --install --yarn && npx jetify",

diff --git a/src/actions/actions/UserData.js b/src/actions/actions/UserData.js
@@ -369,6 +369,9 @@ export const addKeypairs = async (
     const seed = accountSeeds[seedType]
       ? accountSeeds[seedType]
       : accountSeeds[ELECTRUM];
+
+    if (!seed) throw new Error('No seed found for account');
+
     if (
       coinObj.compatible_channels.includes(seedType) &&
       (seedType !== DLIGHT_PRIVATE || accountSeeds[seedType])

diff --git a/src/containers/Settings/ProfileSettings/ProfileSettings.js b/src/containers/Settings/ProfileSettings/ProfileSettings.js
@@ -417,7 +417,7 @@ class ProfileSettings extends Component {
           />
           <Divider />
         </TouchableOpacity>
-        <TouchableOpacity onPress={() => this._openSettings(RESET_PWD)}>
+        {/* <TouchableOpacity onPress={() => this._openSettings(RESET_PWD)}>
           <List.Item
             title={"Change Password"}
             left={(props) => <List.Icon {...props} icon={"lock-reset"} />}
@@ -426,7 +426,7 @@ class ProfileSettings extends Component {
             )}
           />
           <Divider />
-        </TouchableOpacity>
+        </TouchableOpacity> */}
         {(this.props.activeAccount.biometry ||
           this.state.supportedBiometryType.biometry) && (
           <TouchableOpacity