From e722f135780cdb958504f997ba1e58f1b473d21f Mon Sep 17 00:00:00 2001 From: marcosrdz Date: Sat, 29 May 2021 01:44:50 -0400 Subject: [PATCH] DEL: Remove inappbrowser package. --- ios/Podfile.lock | 28 ++++++++++++++-------------- package-lock.json | 14 +++----------- package.json | 3 +-- screen/wallets/buyBitcoin.js | 23 +++++++++++++---------- 4 files changed, 31 insertions(+), 37 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 73992e3ed..cf32a2380 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -287,7 +287,7 @@ PODS: - React - react-native-tor (0.1.7): - React - - react-native-webview (11.4.2): + - react-native-webview (11.6.2): - React-Core - react-native-widget-center (0.0.4): - React @@ -366,7 +366,7 @@ PODS: - React-Core - RNDefaultPreference (1.4.3): - React - - RNDeviceInfo (8.1.2): + - RNDeviceInfo (8.1.3): - React-Core - RNFS (2.17.0): - React @@ -374,7 +374,7 @@ PODS: - React-Core - RNHandoff (0.0.3): - React - - RNInAppBrowser (3.5.1): + - RNKeychain (7.0.0): - React-Core - RNLocalize (2.0.3): - React-Core @@ -382,8 +382,8 @@ PODS: - React - RNQuickAction (0.3.13): - React - - RNRate (1.2.4): - - React + - RNRate (1.2.6): + - React-Core - RNReactNativeHapticFeedback (1.11.0): - React-Core - RNReanimated (2.1.0): @@ -422,7 +422,7 @@ PODS: - RNSentry (2.5.0-beta.1): - React-Core - Sentry (= 7.0.0) - - RNShare (6.0.0): + - RNShare (6.0.1): - React-Core - RNSVG (12.1.1): - React @@ -516,7 +516,7 @@ DEPENDENCIES: - RNFS (from `../node_modules/react-native-fs`) - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) - RNHandoff (from `../node_modules/react-native-handoff`) - - RNInAppBrowser (from `../node_modules/react-native-inappbrowser-reborn`) + - RNKeychain (from `../node_modules/react-native-keychain`) - RNLocalize (from `../node_modules/react-native-localize`) - RNPrivacySnapshot (from `../node_modules/react-native-privacy-snapshot`) - RNQuickAction (from `../node_modules/react-native-quick-actions`) @@ -660,8 +660,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-gesture-handler" RNHandoff: :path: "../node_modules/react-native-handoff" - RNInAppBrowser: - :path: "../node_modules/react-native-inappbrowser-reborn" + RNKeychain: + :path: "../node_modules/react-native-keychain" RNLocalize: :path: "../node_modules/react-native-localize" RNPrivacySnapshot: @@ -745,7 +745,7 @@ SPEC CHECKSUMS: react-native-safe-area-context: e471852c5ed67eea4b10c5d9d43c1cebae3b231d react-native-tcp-socket: 96a4f104cdcc9c6621aafe92937f163d88447c5b react-native-tor: 4f389f5719dad633542b57ea32744e954730e7ef - react-native-webview: 90ccc4add19f940dfe6c89d30659aed8134f234d + react-native-webview: 1f56115845c98f0a59dfbbac685797c014a821be react-native-widget-center: 0f81d17beb163e7fb5848b06754d7d277fe7d99a React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336 React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b @@ -764,21 +764,21 @@ SPEC CHECKSUMS: RNCMaskedView: f127cd9652acfa31b91dcff613e07ba18b774db6 RNCPushNotificationIOS: 5b1cf9ad2aaa107ecb92d5d2d7005ba521b2b97a RNDefaultPreference: 21816c0a6f61a2829ccc0cef034392e9b509ee5f - RNDeviceInfo: 4f480456c7ac8c9919448375399c1a6f14479549 + RNDeviceInfo: 49f6d50f861c7810fac2dd9b71cfb56cc1940e14 RNFS: 93d5b5535eb39d98e6b19009faa8fe717f7ea45d RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 RNHandoff: d3b0754cca3a6bcd9b25f544f733f7f033ccf5fa - RNInAppBrowser: 3733c1aa6699983a1c9b4963e85d5e5a48ad297e + RNKeychain: f75b8c8b2f17d3b2aa1f25b4a0ac5b83d947ff8f RNLocalize: 29e84ea169d3bca6c3b83584536c7f586a07fb98 RNPrivacySnapshot: 71919dde3c6a29dd332115409c2aec564afee8f4 RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93 - RNRate: 2b31dad120cd1b78e33c6034808561c386a3dddf + RNRate: e0af7e724e5fcf89578dbd22ab6395c85402ef29 RNReactNativeHapticFeedback: 653a8c126a0f5e88ce15ffe280b3ff37e1fbb285 RNReanimated: 70f662b5232dd5d19ccff581e919a54ea73df51c RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d RNSecureKeyStore: f1ad870e53806453039f650720d2845c678d89c8 RNSentry: 1868bcfe8c69b2c3b2451439a38b3ebea0a7510f - RNShare: 31fa0cedbd06c2744a78e0d2b7ba364778aa3506 + RNShare: 755de6bac084428f8fd8fb54c376f126f40e560c RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59 RNWatch: e4c5d19506c94506860032fb68aedd5991beb985 diff --git a/package-lock.json b/package-lock.json index ea66907c3..22aaf6082 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17674,14 +17674,6 @@ "resolved": "https://registry.npmjs.org/react-native-image-picker/-/react-native-image-picker-3.5.0.tgz", "integrity": "sha512-i3vr3cM/nu+FbpDpW+msxKX5dvFCMo0DIvHgDGxD9r43KgEDHcROavjQSAXjul/WDfMA2dqlR6gqi1AM8JLkvA==" }, - "react-native-inappbrowser-reborn": { - "version": "git+https://github.com/BlueWallet/react-native-inappbrowser.git#fa2d8e1763e46dd12a7e53081e97a0f908049103", - "from": "git+https://github.com/BlueWallet/react-native-inappbrowser.git#fa2d8e1763e46dd12a7e53081e97a0f908049103", - "requires": { - "invariant": "^2.2.4", - "opencollective-postinstall": "^2.0.2" - } - }, "react-native-iphone-x-helper": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz", @@ -18101,9 +18093,9 @@ } }, "react-native-webview": { - "version": "11.4.3", - "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.4.3.tgz", - "integrity": "sha512-bC6r7vbukC1QYbG2vTmif8/gt6jzlGA7WK7zeVLt8ysZJvBNtoHtT2k7EoMgJIW6/6DTy1rrn6uZS4v2Fa4exQ==", + "version": "11.6.2", + "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-11.6.2.tgz", + "integrity": "sha512-7e5ltLBgqt1mX0gdTTS2nFPIjfS6y300wqJ4rLWqU71lDO+8ZeayfsF5qo83qxo2Go74CtLnSeWae4pdGwUqYw==", "requires": { "escape-string-regexp": "2.0.0", "invariant": "2.2.4" diff --git a/package.json b/package.json index 730bf10cd..f529711cf 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,6 @@ "react-native-haptic-feedback": "1.11.0", "react-native-idle-timer": "https://github.com/BlueWallet/react-native-idle-timer#8587876d68ab5920e79619726aeca9e672beaf2b", "react-native-image-picker": "3.5.0", - "react-native-inappbrowser-reborn": "https://github.com/BlueWallet/react-native-inappbrowser#fa2d8e1763e46dd12a7e53081e97a0f908049103", "react-native-is-catalyst": "https://github.com/BlueWallet/react-native-is-catalyst#v1.0.0", "react-native-keychain": "7.0.0", "react-native-level-fs": "3.0.1", @@ -169,7 +168,7 @@ "react-native-tor": "0.1.7", "react-native-vector-icons": "7.1.0", "react-native-watch-connectivity": "1.0.3", - "react-native-webview": "11.4.3", + "react-native-webview": "11.6.2", "react-native-widget-center": "https://github.com/BlueWallet/react-native-widget-center#e2e9a9038b76d096bf929a87105a97a0a7095001", "react-test-render": "1.1.2", "readable-stream": "3.6.0", diff --git a/screen/wallets/buyBitcoin.js b/screen/wallets/buyBitcoin.js index 6c9cd8c71..c0ff34ba6 100644 --- a/screen/wallets/buyBitcoin.js +++ b/screen/wallets/buyBitcoin.js @@ -2,12 +2,13 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { StatusBar, Linking } from 'react-native'; import { WebView } from 'react-native-webview'; -import InAppBrowser from 'react-native-inappbrowser-reborn'; - import { BlueLoading, SafeBlueArea } from '../../BlueComponents'; import navigationStyle from '../../components/navigationStyle'; import { LightningCustodianWallet, WatchOnlyWallet } from '../../class'; import { BlueStorageContext } from '../../blue_modules/storage-context'; +import { isCatalyst } from '../../blue_modules/environment'; +import * as NavigationService from '../../NavigationService'; + const currency = require('../../blue_modules/currency'); export default class BuyBitcoin extends Component { @@ -81,7 +82,10 @@ export default class BuyBitcoin extends Component { return ( + { - const uri = await BuyBitcoin.generateURL(wallet); - InAppBrowser.isAvailable() - .then(_value => { - InAppBrowser.open(uri, { dismissButtonStyle: 'done', modalEnabled: true, animated: true }); - }) - .catch(error => { - console.log(error); - Linking.openURL(uri); + if (isCatalyst) { + const uri = await BuyBitcoin.generateURL(wallet); + Linking.openURL(uri); + } else { + NavigationService.navigate('BuyBitcoin', { + wallet, }); + } };