diff --git a/src/Contacts/Views/AddContactView.web.js b/src/Contacts/Views/AddContactView.web.js index efc4dd85..b2ccd634 100644 --- a/src/Contacts/Views/AddContactView.web.js +++ b/src/Contacts/Views/AddContactView.web.js @@ -42,10 +42,12 @@ class AddContactView extends ContactFormView { ) self.actionButtonsContainerView = view { - if (self.context.Cordova_isMobile === true /* but not context.isMobile */) { // til we have Electron support + if (self.context.deviceInfo.platform === 'android' || self.context.deviceInfo.platform === 'ios') { self._setup_actionButton_useCamera() } - self._setup_actionButton_chooseFile() + if (self.context.deviceInfo.platform !== 'ios') { + self._setup_actionButton_chooseFile() + } } self.form_containerLayer.appendChild(view.layer) } diff --git a/src/RequestFunds/Views/CreateRequestFormView.web.js b/src/RequestFunds/Views/CreateRequestFormView.web.js index 10516095..c70dfe96 100644 --- a/src/RequestFunds/Views/CreateRequestFormView.web.js +++ b/src/RequestFunds/Views/CreateRequestFormView.web.js @@ -50,9 +50,6 @@ class CreateRequestFormView extends View { layer.style.width = '100%' layer.style.height = '100%' layer.style.padding = '0 0 40px 0' // actually going to change paddingTop in self.viewWillAppear() if navigation controller - if (self.context.Cordova_isMobile === true) { - layer.style.paddingBottom = '300px' // very hacky, but keyboard UX takes dedication to get right, and would like to save that effort for native app - } layer.style.overflowY = 'auto' layer.classList.add( // so that we get autoscroll to form field inputs on mobile platforms commonComponents_forms.ClassNameForScrollingAncestorOfScrollToAbleElement() diff --git a/src/SendFundsTab/Views/SendFundsView_Base.web.js b/src/SendFundsTab/Views/SendFundsView_Base.web.js index 40312363..5d6ea827 100644 --- a/src/SendFundsTab/Views/SendFundsView_Base.web.js +++ b/src/SendFundsTab/Views/SendFundsView_Base.web.js @@ -104,18 +104,6 @@ class SendFundsView extends View { layer.style.width = '100%' layer.style.height = '100%' layer.style.padding = '0' // actually going to change paddingTop in self.viewWillAppear() if navigation controller - if (self.context.Cordova_isMobile === true) { - layer.style.paddingBottom = '300px' // very hacky, but keyboard UX takes dedication to get right, and would like to save that effort for native app - // layer.style.webkitOverflowScrolling = "touch" - // disabling this cause it conflicts with touchup/end of contacts picker - // layer.addEventListener("touchmove", function() - // { // blur currently text input field on user scroll - // const activeElement = document.activeElement - // if (activeElement) { - // activeElement.blur() - // } - // }, false) - } layer.style.overflowY = 'auto' layer.classList.add( // so that we get autoscroll to form field inputs on mobile platforms commonComponents_forms.ClassNameForScrollingAncestorOfScrollToAbleElement() diff --git a/src/WalletWizard/Views/CreateWallet_ConfirmMnemonic_View.web.js b/src/WalletWizard/Views/CreateWallet_ConfirmMnemonic_View.web.js index d408d9b5..f57b311b 100644 --- a/src/WalletWizard/Views/CreateWallet_ConfirmMnemonic_View.web.js +++ b/src/WalletWizard/Views/CreateWallet_ConfirmMnemonic_View.web.js @@ -303,9 +303,9 @@ class CreateWallet_ConfirmMnemonic_View extends BaseView_AWalletWizardScreen { } function ____reEnable_userIdleAndScreenSleepFromSubmissionDisable () { // factored because we would like to call this on successful submission too! self.context.userIdleInWindowController.ReEnable_userIdle() - if (self.context.Cordova_isMobile === true) { - window.plugins.insomnia.allowSleepAgain() // re-enable screen dim/off - } + // if (self.context.Cordova_isMobile === true) { + // window.plugins.insomnia.allowSleepAgain() // re-enable screen dim/off + // } } function ___reEnableFormFromSubmissionDisable () { self.isDisabledFromSubmission = false @@ -322,9 +322,9 @@ class CreateWallet_ConfirmMnemonic_View extends BaseView_AWalletWizardScreen { { // disable form self.isDisabledFromSubmission = true self.context.userIdleInWindowController.TemporarilyDisable_userIdle() - if (self.context.Cordova_isMobile === true) { - window.plugins.insomnia.keepAwake() // disable screen dim/off - } + // if (self.context.Cordova_isMobile === true) { + // window.plugins.insomnia.keepAwake() // disable screen dim/off + // } // self.validationMessageLayer.ClearAndHideMessage() // diff --git a/src/WalletWizard/Views/UseExisting_MetaInfo_View.web.js b/src/WalletWizard/Views/UseExisting_MetaInfo_View.web.js index 4a071310..66e3ec22 100644 --- a/src/WalletWizard/Views/UseExisting_MetaInfo_View.web.js +++ b/src/WalletWizard/Views/UseExisting_MetaInfo_View.web.js @@ -483,9 +483,9 @@ class UseExisting_MetaInfo_View extends BaseView_Wallet_MetaInfo { { self.isDisabledFromSubmission = true self.context.userIdleInWindowController.TemporarilyDisable_userIdle() - if (self.context.Cordova_isMobile === true) { - window.plugins.insomnia.keepAwake() // disable screen dim/off - } + // if (self.context.Cordova_isMobile === true) { + // window.plugins.insomnia.keepAwake() // disable screen dim/off + // } // try { const ret = self.context.monero_utils.seed_and_keys_from_mnemonic( @@ -519,9 +519,9 @@ class UseExisting_MetaInfo_View extends BaseView_Wallet_MetaInfo { } function ____reEnable_userIdleAndScreenSleepFromSubmissionDisable () { // factored because we would like to call this on successful submission too! self.context.userIdleInWindowController.ReEnable_userIdle() - if (self.context.Cordova_isMobile === true) { - window.plugins.insomnia.allowSleepAgain() // re-enable screen dim/off - } + // if (self.context.Cordova_isMobile === true) { + // window.plugins.insomnia.allowSleepAgain() // re-enable screen dim/off + // } } function ___reEnableFormFromSubmissionDisable () { self.isDisabledFromSubmission = false