Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FEN-69 fix android crash #52

Merged
merged 4 commits into from
Aug 1, 2023
+27 −37
Merged

FEN-69 fix android crash #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a532674
FEN-69 fixed SDK crash on Android
dima-bezugly Jul 19, 2023
9ebbb64
0.1.9-beta.0
dima-bezugly Jul 19, 2023
eb62b6a
0.1.9
dima-bezugly Aug 1, 2023
a7962b8
Fixes
dima-bezugly Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"main": "src/components/LinkSDK/index.js",
"name": "lean-react-native",
"version": "0.1.8",
"version": "0.1.9",
"description": "A React Native wrapper for Lean's LinkSDK",
"repository": {
"type": "git",
Expand Down
58 changes: 24 additions & 34 deletions src/components/LinkSDK/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ const COUNTRY__SA = 'SaudiArabia';

const LinkSDK = forwardRef((props, ref) => {
// create a ref for injectJavaScript to use
const [injectedJavascript, setInjectedJavascript] = useState('');
const SDK = useRef(null);

// create state to manage SDK visibility
const [isOpen, setIsOpen] = useState(false);
const openLinkSDK = (flowScript) => {
setInjectedJavascript(flowScript);
setIsOpen(true);
};

// useImperativeHandle allows the methods to be called outside of the component
useImperativeHandle(ref, () => ({
Expand All @@ -18,10 +23,8 @@ const LinkSDK = forwardRef((props, ref) => {

// initialise connect flow
connect(opts) {
setIsOpen(true);
const keys = Object.keys(opts);

const call = `
const flowScript = `
function postResponse(status) {
status.method = "CONNECT"
window.ReactNativeWebView.postMessage(JSON.stringify(status))
Expand All @@ -41,15 +44,13 @@ const LinkSDK = forwardRef((props, ref) => {
}
`;

SDK.current.injectJavaScript(call);
openLinkSDK(flowScript);
},

// initialise link flow
link(opts) {
setIsOpen(true);
const keys = Object.keys(opts);

const call = `
const flowScript = `
function postResponse(status) {
status.method = "LINK"
window.ReactNativeWebView.postMessage(JSON.stringify(status))
Expand All @@ -69,15 +70,13 @@ const LinkSDK = forwardRef((props, ref) => {
}
`;

SDK.current.injectJavaScript(call);
openLinkSDK(flowScript);
},

// initialise reconnect flow
reconnect(opts) {
setIsOpen(true);
const keys = Object.keys(opts);

const call = `
const flowScript = `
function postResponse(status) {
status.method = "RECONNECT"
window.ReactNativeWebView.postMessage(JSON.stringify(status))
Expand All @@ -97,15 +96,13 @@ const LinkSDK = forwardRef((props, ref) => {
}
`;

SDK.current.injectJavaScript(call);
openLinkSDK(flowScript);
},

// initialise CPS flow
createPaymentSource(opts) {
setIsOpen(true);
const keys = Object.keys(opts);

const call = `
const flowScript = `
function postResponse(status) {
status.method = "CREATE_PAYMENT_SOURCE"
window.ReactNativeWebView.postMessage(JSON.stringify(status))
Expand All @@ -124,15 +121,14 @@ const LinkSDK = forwardRef((props, ref) => {
postResponse({ method: "CREATE_PAYMENT_SOURCE", status: "ERROR", message: "Lean not initialized" })
}
`;
SDK.current.injectJavaScript(call);

openLinkSDK(flowScript);
},

// initialise pay flow
pay(opts) {
setIsOpen(true);
const keys = Object.keys(opts);

const call = `
const flowScript = `
function postResponse(status) {
status.method = "PAY"
window.ReactNativeWebView.postMessage(JSON.stringify(status))
Expand All @@ -152,15 +148,13 @@ const LinkSDK = forwardRef((props, ref) => {
}
`;

SDK.current.injectJavaScript(call);
openLinkSDK(flowScript);
},

// updatePaymentSource flow
updatePaymentSource(opts) {
setIsOpen(true);
const keys = Object.keys(opts);

const call = `
const flowScript = `
function postResponse(status) {
status.method = "UPDATE_PAYMENT_SOURCE"
window.ReactNativeWebView.postMessage(JSON.stringify(status))
Expand All @@ -180,7 +174,7 @@ const LinkSDK = forwardRef((props, ref) => {
}
`;

SDK.current.injectJavaScript(call);
openLinkSDK(flowScript);
},
}));

Expand All @@ -192,9 +186,13 @@ const LinkSDK = forwardRef((props, ref) => {
}
};

if (!isOpen) {
return null;
}

return (
<View
style={isOpen ? styles.container : styles.containerClosed}
style={styles.container}
height={Dimensions.get('window').height}
width={Dimensions.get('window').width}>
<WebView
Expand All @@ -204,6 +202,7 @@ const LinkSDK = forwardRef((props, ref) => {
originWhitelist={['*']}
allowsInlineMediaPlayback={true}
mediaPlaybackRequiresUserAction={false}
injectedJavaScript={injectedJavascript}
source={{
baseUrl: 'https://leantech.me',
html: require('./base.js')({
Expand Down Expand Up @@ -246,15 +245,6 @@ const styles = StyleSheet.create({
height: '100%',
zIndex: 2,
},
containerClosed: {
display: 'none',
position: 'relative',
left: 0,
top: 0,
width: '100%',
height: '100%',
zIndex: 2,
},
WebView: {
position: 'absolute',
top: 0,
Expand Down