Merge pull request #78 from mymonero/develop

update main to v1.3.4 release changes

README.md

@@ -81,6 +81,7 @@ iOS: To build the app, run the command below. XCode will be opened automatically
 ```bash
 npm run build-ios
 ```
+If using a Mac computer with Apple silicon and this step results in build errors,  may have to remove the created Pods folder and use the command ```bash  arch -x86_64 pod install``` instead of the default ```bash pod install```. 
 
 To run the app in a web browser, run the following
 ```bash
@@ -177,4 +178,4 @@ Contributors to each release are credited in release notes.
 
 See `LICENSE.txt` for license.
 
-All app source code and assets copyright © 2014-2022 by MyMonero. All rights reserved.
+All app source code and assets copyright © 2014-2022 by MyMonero. All rights reserved.

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.mymonero.official_android_application"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 26
-        versionName "1.3.2"
+        versionCode 28
+        versionName "1.3.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

ios/App/App.xcodeproj/project.pbxproj

@@ -357,13 +357,13 @@
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 57;
+				CURRENT_PROJECT_VERSION = 60;
 				DEVELOPMENT_TEAM = NLN5D623Y3;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.5;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mymonero.mymonero-app";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -382,13 +382,13 @@
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 57;
+				CURRENT_PROJECT_VERSION = 60;
 				DEVELOPMENT_TEAM = NLN5D623Y3;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.3;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mymonero.mymonero-app";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

package.json

@@ -2,7 +2,7 @@
   "name": "MyMonero",
   "author": "MyMonero",
   "description": "The simplest way to use Monero",
-  "version": "1.3.2",
+  "version": "1.3.5",
   "license": "SEE LICENSE IN LICENSE.txt",
   "repository": "https://github.com/mymonero/mymonero-mobile",
   "scripts": {
@@ -39,7 +39,7 @@
     "@ionic/pwa-elements": "^3.0.2",
     "@johnbraum/capacitor-qrscanner": "^1.1.11",
     "@mymonero/capacitor-file-picker": "^2.1.5",
-    "@mymonero/mymonero-app-bridge": "^2.1.18",
+    "@mymonero/mymonero-app-bridge": "^2.1.26",
     "@mymonero/mymonero-bigint": "^1.1.15",
     "@mymonero/mymonero-bridge-utils": "^1.1.15",
     "@mymonero/mymonero-exchange": "^1.1.17",

src/MainWindow/Controllers/ExceptionAlerting.browser.web.js

@@ -22,22 +22,54 @@ class ExceptionAlerting {
   _startObserving () {
     const self = this
     window.onerror = function (message, file, line, col, error) {
-      self.alertErrMsg(error.message, 1)
+      self.alertErrMsg(message, 1, error, file, line, col)
       return false
     }
-    window.addEventListener('error', function (e) {
-      self.alertErrMsg(e.error.message, 2)
+    window.addEventListener('error', function (e) { // the nice thing about these errors 
+      // Let's see if we can get the prototype of the error object
+      let errorMessage = '';
+      try {
+        errorMessage += 'Instance of ' + Object.getPrototypeOf(e) + ' error - ';
+      } catch (err) {
+        errorMessage += 'Unable to determine prototype of error - ';
+      }
+      if (typeof(e.error) !== 'undefined' && typeof(e.error.message) !== 'undefined') {
+        errorMessage += `Error type 2 w/ e.error.message: ${e.error.message}`
+        self.alertErrMsg(errorMessage, 2, e, e.filename, e.lineno, e.colno)
+      } else if (typeof(e.error) !== 'undefined'){
+        errorMessage += `Error type 2 w/ e.error: ${e.error}`,
+        self.alertErrMsg(errorMessage, 2, e, e.filename, e.lineno, e.colno)
+      } else {
+        errorMessage += `Error type 2 w/ e.error not defined: ${e}`
+        self.alertErrMsg(errorMessage, 2, e, e.filename, e.lineno, e.colno)
+      }
       return false
     })
     window.addEventListener('unhandledrejection', function (e) {
-      self.alertErrMsg(e.reason.message, 3)
+      let errorMessage = '';
+      try {
+        errorMessage += 'Instance of ' + Object.getPrototypeOf(e) + ' error - ';
+      } catch (err) {
+        errorMessage += 'Unable to determine prototype of error - ';
+      }
+      if (typeof(e.error) !== 'undefined' && typeof(e.error.message) !== 'undefined') {
+        errorMessage += `Error type 3 w/ e.error.message: ${e.error.message}`
+        self.alertErrMsg(errorMessage, 3, e, e.filename, e.lineno, e.colno)
+      } else if (typeof(e.error) !== 'undefined'){
+        errorMessage += `Error type 3 w/ e.error: ${e.error}`,
+        self.alertErrMsg(errorMessage, 2, e, e.filename, e.lineno, e.colno)
+      } else {
+        errorMessage += `Error type 3 w/ e.error not defined: ${e}`
+        self.alertErrMsg(errorMessage, 2, e, e.filename, e.lineno, e.colno)
+      }
+      //self.alertErrMsg(e.error.message, 2, e, e.filename, e.lineno, e.colno)
       return false
     })
   }
 
   //
   // Imperatives
-  alertErrMsg (message, handlerId) {
+  alertErrMsg (message, handlerId, errorObj, file = null, line = null, col = null) {
     // const self = this;
     // self.doToastMessage("Unhandled error. Please inform MyMonero Support of this message: " + message, message);
     // if (message.indexOf("undefined") !== -1 && message.indexOf("handler") !== -1) {
@@ -48,20 +80,26 @@ class ExceptionAlerting {
     // } else {
     // 	self.doToastMessage("Unrecognized error occured. Please contact Support with steps and browser informations.", undefined)
     // }
-    let errorHtml = 'An unexpected application error occurred.\n\nPlease let us know of '
-    errorHtml += `the following error message as it could be a bug:\n\n <p><span style='font-size: 11px;'>${message}`
+    let errorHtml = `An unexpected application error occurred.\n\nPlease let us know of the following error message as it could be a bug:\n\n <p><span style='font-size: 11px;'>`
+    errorHtml += `
+      <p>File: ${file} <br>Line: ${line} <br>Col: ${col} <br>Message:
+      <span style='font-size: 11px;'>${message}</span></p>
+    `;
     errorHtml += '</span></p>'
 
     let errStr = `An unexpected application error occurred. The following error message was encountered: \n\n ${message}`
+    errStr += `
+      <p>File: ${file} <br>Line: ${line} <br>Col: ${col} <br>Message:
+      <span style='font-size: 11px;'>${message}</span></p>
+    `;
     // append stack trace to error we copy to clipboard
 
-    errStr += navigator.userAgent
+    errStr += "Stack: " + errorObj.error.stack + " - " + navigator.userAgent
 
     Swal.fire({
       title: 'MyMonero has encountered an error',
       html: errorHtml,
       background: '#272527',
-      titleColor: '#FFFFFF',
       color: '#FFFFFF',
       text: 'Do you want to continue',
       confirmButtonColor: '#11bbec',

src/Passwords/Views/ForgotPasswordView.web.js

@@ -109,11 +109,11 @@ class ForgotPasswordView extends View {
       null, // no image
       true,
       function (layer, e) {
-        const msg = 'Are you sure you want to clear your locally stored data?\n\nAny wallets will remain permanently on the Monero blockchain. At present, local-only data like contacts would not be recoverable.'
+        const msg = 'Are you sure you want to delete your wallet data?\n\nNo account information that links you to your wallets is retained by MyMonero. Recovery will only be possible by using your mnemonic seed. MyMonero does not retain personally identifiable data.'
         self.context.windowDialogs.PresentQuestionAlertDialogWith(
-          'Delete everything?',
+          'Delete all wallet and account data?',
           msg,
-          'Delete Everything',
+          'Delete Wallet and Account Data',
           'Cancel',
           function (err, didChooseYes) {
             if (err) {

src/SendFundsTab/Views/SendFundsView_Base.web.js

@@ -1587,6 +1587,7 @@ class SendFundsView extends View {
 
       const contact_hasOpenAliasAddress = hasPickedAContact ? self.pickedContact.HasOpenAliasAddress() : undefined
       const contact_address = hasPickedAContact ? self.pickedContact.address : undefined
+
 
       // Check if Yat, if yes, use resolved address
       if (typeof(hasPickedAContact) !== "undefined" && hasPickedAContact != false) {
@@ -1595,8 +1596,13 @@ class SendFundsView extends View {
           contact_address = self.pickedContact.resolvedAddress
         }
       }
-      wallet.SendFunds(
-        enteredAddressValue, // currency-ready wallet address, but not an OpenAlias address (resolve before calling)
+
+     const destinations = [
+        {to_address: enteredAddressValue,
+        send_amount: '' + final_XMR_amount_Number}
+     ]; 
+     wallet.SendFunds(
+	destinations,
         resolvedAddress,
         manuallyEnteredPaymentID,
         resolvedPaymentID,
@@ -1608,7 +1614,6 @@ class SendFundsView extends View {
         cached_OAResolved_address,
         contact_hasOpenAliasAddress,
         contact_address,
-        '' + final_XMR_amount_Number,
         sweeping, // when true, amount will be ignored
         self._selected_simplePriority(),
         preSuccess_nonTerminal_statusUpdate_fn,

src/Settings/Views/SettingsView.web.js

@@ -476,7 +476,7 @@ class SettingsView extends View {
     const self = this
     const div = document.createElement('div')
     div.style.paddingTop = '23px'
-    const titleText = 'DELETE EVERYTHING'
+    const titleText = 'DELETE ACCOUNT DATA'
     const view = commonComponents_tables.New_redTextButtonView(titleText, self.context)
     self.deleteEverything_buttonView = view
     const layer = view.layer
@@ -489,12 +489,12 @@ class SettingsView extends View {
         }
         let msg
 
-        msg = 'Are you sure you want to delete all of your local data?\n\nAny wallets will remain permanently on the Monero blockchain but local data such as contacts will not be recoverable.'
+        msg = 'Are you sure you want to delete your wallet data?\n\nNo account information that links you to your wallets is retained by MyMonero. Recovery will only be possible by using your mnemonic seed. MyMonero does not retain personally identifiable data, and our staff will never ask you to disclose your mnemonic seed.'
 
         self.context.windowDialogs.PresentQuestionAlertDialogWith(
-          'Delete everything?',
+          'Delete wallet and account data?',
           msg,
-          'Delete Everything',
+          'Delete Wallet and Account Data',
           'Cancel',
           function (err, didChooseYes) {
             if (err) {

src/Wallets/Models/Wallet.js

@@ -1141,7 +1141,7 @@ class Wallet extends EventEmitter {
   // Runtime - Imperatives - Public - Sending funds
 
   SendFunds (
-    enteredAddressValue, // currency-ready wallet address, but not an OpenAlias address (resolve before calling)
+    destinations, 
     resolvedAddress,
     manuallyEnteredPaymentID,
     resolvedPaymentID,
@@ -1155,7 +1155,6 @@ class Wallet extends EventEmitter {
     contact_hasOpenAliasAddress,
     contact_address,
     //
-    raw_amount_string,
     isSweepTx, // when true, amount will be ignored
     simple_priority,
     //
@@ -1184,6 +1183,7 @@ class Wallet extends EventEmitter {
       // critical to do on every exit from this method
       self.context.userIdleInWindowController.ReEnable_userIdle()
     }
+    const raw_amount_string = destinations[0].send_amount
     const statusUpdate_messageBase = isSweepTx ? 'Sending wallet balance…' : `Sending ${raw_amount_string} XMR…`
     const processStepMessageSuffix_byEnumVal =
 		{
@@ -1250,10 +1250,10 @@ class Wallet extends EventEmitter {
 		{
 		  fromWallet_didFailToInitialize: self.didFailToInitialize_flag == true,
 		  fromWallet_didFailToBoot: self.didFailToBoot_flag == true,
-		  fromWallet_needsImport: self.shouldDisplayImportAccountOption == true,
+		  fromWallet_needsImport: false,
 		  requireAuthentication: self.context.settingsController.authentication_requireWhenSending != false,
 		  //
-		  sending_amount_double_string: raw_amount_string,
+	          destinations: destinations, 
 		  hasPickedAContact: hasPickedAContact,
 		  resolvedAddress_fieldIsVisible: resolvedAddress_fieldIsVisible,
 		  manuallyEnteredPaymentID_fieldIsVisible: manuallyEnteredPaymentID_fieldIsVisible,
@@ -1267,7 +1267,6 @@ class Wallet extends EventEmitter {
 		  priority: simple_priority,
 		  nettype: self.context.nettype,
 		  //
-		  enteredAddressValue: enteredAddressValue, // may be ""
 		  resolvedAddress: resolvedAddress, // may be ""
 		  manuallyEnteredPaymentID: manuallyEnteredPaymentID, // may be ""
 		  resolvedPaymentID: resolvedPaymentID, // may be ""