summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-10-24 15:47:44 +0200
committerLibravatar GitHub <noreply@github.com>2017-10-24 15:47:44 +0200
commit7e3fe6781a45548202ee4eab6cba17906c9be2d0 (patch)
tree24b4c8c7f5c16d96d83a128456b13c6055170781
parentMerge branch 'develop' into feature/recipe-manager (diff)
parentMerge pull request #97 from meetfranz/feature/payment-url (diff)
downloadferdium-app-7e3fe6781a45548202ee4eab6cba17906c9be2d0.tar.gz
ferdium-app-7e3fe6781a45548202ee4eab6cba17906c9be2d0.tar.zst
ferdium-app-7e3fe6781a45548202ee4eab6cba17906c9be2d0.zip
Merge branch 'develop' into feature/recipe-manager
-rw-r--r--src/components/ui/SubscriptionPopup.js2
-rw-r--r--src/containers/ui/SubscriptionPopupScreen.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/ui/SubscriptionPopup.js
index 72b6ccd98..5aae2c47a 100644
--- a/src/components/ui/SubscriptionPopup.js
+++ b/src/components/ui/SubscriptionPopup.js
@@ -57,7 +57,7 @@ export default class SubscriptionPopup extends Component {
57 className="subscription-popup__webview" 57 className="subscription-popup__webview"
58 58
59 autosize 59 autosize
60 src={url} 60 src={encodeURI(url)}
61 disablewebsecurity 61 disablewebsecurity
62 onDidNavigate={completeCheck} 62 onDidNavigate={completeCheck}
63 // onNewWindow={(event, url, frameName, options) => 63 // onNewWindow={(event, url, frameName, options) =>
diff --git a/src/containers/ui/SubscriptionPopupScreen.js b/src/containers/ui/SubscriptionPopupScreen.js
index d17477b1d..0b6432e50 100644
--- a/src/containers/ui/SubscriptionPopupScreen.js
+++ b/src/containers/ui/SubscriptionPopupScreen.js
@@ -24,7 +24,7 @@ export default class SubscriptionPopupScreen extends Component {
24 render() { 24 render() {
25 return ( 25 return (
26 <SubscriptionPopup 26 <SubscriptionPopup
27 url={decodeURIComponent(this.props.router.params.url)} 27 url={this.props.router.params.url}
28 closeWindow={() => window.close()} 28 closeWindow={() => window.close()}
29 completeCheck={e => this.completeCheck(e)} 29 completeCheck={e => this.completeCheck(e)}
30 isCompleted={this.state.complete} 30 isCompleted={this.state.complete}