From 173fb3205cc8015989a7072d9c24108674900afe Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Thu, 1 Aug 2024 11:22:46 +0300 Subject: [PATCH 01/13] Update package.json web view versions --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index db39527..5a0b8bb 100644 --- a/package.json +++ b/package.json @@ -67,8 +67,8 @@ "react-native": "*" }, "dependencies": { - "prop-types": "^15.6.2", - "react-native-webview": ">=6.0.2" + "prop-types": "^15.8.1", + "react-native-webview": ">=13.8.6" }, "config": { "commitizen": { From 5f3cb375bc6b521cca90108d1ef201ebc0f009e1 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 18 Aug 2024 06:07:18 +0300 Subject: [PATCH 02/13] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a0b8bb..ed55352 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ }, "dependencies": { "prop-types": "^15.8.1", - "react-native-webview": ">=13.8.6" + "react-native-webview": "^13.8.6" }, "config": { "commitizen": { From 0400bbed2dd0e7fc98e545f6a1a215a16315b2dc Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 18 Aug 2024 06:26:10 +0300 Subject: [PATCH 03/13] Update package.json --- package.json | 64 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index ed55352..7786243 100644 --- a/package.json +++ b/package.json @@ -27,41 +27,41 @@ "author": "Flutterwave Developers", "license": "MIT", "devDependencies": { - "@babel/core": "^7.9.0", - "@babel/runtime": "^7.6.3", - "@react-native-community/eslint-config": "^1.0.0", - "@semantic-release/git": "^9.0.0", - "@types/jest": "^24.9.1", - "@types/react": "^16.9.34", - "@types/react-native": "^0.62.2", - "@types/react-test-renderer": "^16.9.2", - "@typescript-eslint/eslint-plugin": "^2.27.0", - "@typescript-eslint/parser": "^2.27.0", - "abortcontroller-polyfill": "^1.4.0", + "@babel/core": "^7.22.10", + "@babel/runtime": "^7.23.0", + "@react-native-community/eslint-config": "^3.2.0", + "@semantic-release/git": "^10.0.1", + "@types/jest": "^29.5.3", + "@types/react": "^18.2.14", + "@types/react-native": "^0.74.3", + "@types/react-test-renderer": "^18.0.0", + "@typescript-eslint/eslint-plugin": "^6.3.1", + "@typescript-eslint/parser": "^6.3.1", + "abortcontroller-polyfill": "^1.7.3", "babel-core": "^7.0.0-bridge.0", - "babel-jest": "^24.9.0", - "babel-plugin-module-resolver": "3.1.3", - "babel-preset-react-native": "^4.0.1", - "commitizen": "^4.0.4", - "copyfiles": "^2.2.0", - "cz-conventional-changelog": "^3.1.0", - "dotenv": "^8.2.0", - "eslint": "^6.8.0", - "jest": "^24.9.0", + "babel-jest": "^29.7.0", + "babel-plugin-module-resolver": "^5.0.0", + "babel-preset-react-native": "^5.0.2", + "commitizen": "^4.3.0", + "copyfiles": "^2.4.1", + "cz-conventional-changelog": "^3.3.0", + "dotenv": "^16.3.1", + "eslint": "^8.45.0", + "jest": "^29.7.0", "jest-fetch-mock": "^3.0.3", - "log-symbols": "^4.0.0", - "metro-react-native-babel-preset": "^0.56.0", - "mockdate": "^3.0.2", + "log-symbols": "^5.1.0", + "metro-react-native-babel-preset": "^0.76.8", + "mockdate": "^3.0.5", "ncp": "^2.0.0", - "prettier": "^2.0.4", - "pretty-quick": "^2.0.1", - "react": "^16.13.1", - "react-native": "^0.62.2", - "react-test-renderer": "16.8.6", - "semantic-release": "^17.0.8", - "ts-jest": "^24.2.0", - "typescript": "^3.8.3" - }, + "prettier": "^2.8.8", + "pretty-quick": "^3.2.3", + "react": "^18.2.0", + "react-native": "^0.74.3", + "react-test-renderer": "^18.2.0", + "semantic-release": "^21.0.5", + "ts-jest": "^29.1.0", + "typescript": "^5.2.2" +}, "peerDependencies": { "react": "*", "react-native": "*" From de53c15ec3aca9151a191b1ff41d6b1326aadd00 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 18 Aug 2024 06:30:43 +0300 Subject: [PATCH 04/13] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7786243..bad273c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@semantic-release/git": "^10.0.1", "@types/jest": "^29.5.3", "@types/react": "^18.2.14", - "@types/react-native": "^0.74.3", + "@types/react-native": "^0.73.0", "@types/react-test-renderer": "^18.0.0", "@typescript-eslint/eslint-plugin": "^6.3.1", "@typescript-eslint/parser": "^6.3.1", From e52bafd4ca3f42358e647be92dc2752016b3c531 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 31 Aug 2025 10:29:26 +0300 Subject: [PATCH 05/13] Update FlutterwaveCheckout.tsx --- src/FlutterwaveCheckout.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/FlutterwaveCheckout.tsx b/src/FlutterwaveCheckout.tsx index c2a39ec..6ee27be 100644 --- a/src/FlutterwaveCheckout.tsx +++ b/src/FlutterwaveCheckout.tsx @@ -103,7 +103,12 @@ const FlutterwaveCheckout: React.FC = function Flutter return; } // remove tx_ref and dismiss - animateOut().then(onAbort); + animateOut() + + if(onAbort){ + setTimeout(() => { + onAbort(); + }, 500); }, [onAbort, animateOut]); const handleNavigationStateChange = React.useCallback((ev: WebViewNavigation): boolean => { From e44cd67ed69499992b8bfa5ee4f28fe5c6644890 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 31 Aug 2025 11:01:51 +0300 Subject: [PATCH 06/13] Update FlutterwaveCheckout.tsx --- src/FlutterwaveCheckout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FlutterwaveCheckout.tsx b/src/FlutterwaveCheckout.tsx index 6ee27be..e44d095 100644 --- a/src/FlutterwaveCheckout.tsx +++ b/src/FlutterwaveCheckout.tsx @@ -103,7 +103,7 @@ const FlutterwaveCheckout: React.FC = function Flutter return; } // remove tx_ref and dismiss - animateOut() + // animateOut() if(onAbort){ setTimeout(() => { From 0f652b3ab9b3d260a746ae4f693a66bc40006a59 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 31 Aug 2025 12:01:11 +0300 Subject: [PATCH 07/13] Update FlutterwaveCheckout.tsx --- src/FlutterwaveCheckout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FlutterwaveCheckout.tsx b/src/FlutterwaveCheckout.tsx index e44d095..6e00427 100644 --- a/src/FlutterwaveCheckout.tsx +++ b/src/FlutterwaveCheckout.tsx @@ -95,7 +95,7 @@ const FlutterwaveCheckout: React.FC = function Flutter Alert.alert('', 'Are you sure you want to cancel this payment?', [ {text: 'No'}, { - text: 'Yes, Cancel', + text: 'Yes', style: 'destructive', onPress: () => handleAbort(true), }, From 97b1cc8f1b5ab5e0633880f494418ab6ec38cd4a Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 31 Aug 2025 13:04:10 +0300 Subject: [PATCH 08/13] Update FlutterwaveCheckout.tsx --- src/FlutterwaveCheckout.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/FlutterwaveCheckout.tsx b/src/FlutterwaveCheckout.tsx index 6e00427..795b8d7 100644 --- a/src/FlutterwaveCheckout.tsx +++ b/src/FlutterwaveCheckout.tsx @@ -109,6 +109,7 @@ const FlutterwaveCheckout: React.FC = function Flutter setTimeout(() => { onAbort(); }, 500); + } }, [onAbort, animateOut]); const handleNavigationStateChange = React.useCallback((ev: WebViewNavigation): boolean => { From dcc80ad593c79e1703007075ed2be5ab6911f862 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 31 Aug 2025 13:05:07 +0300 Subject: [PATCH 09/13] Update FlutterwaveCheckout.js --- dist/FlutterwaveCheckout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/FlutterwaveCheckout.js b/dist/FlutterwaveCheckout.js index 952c75c..48b3e8f 100644 --- a/dist/FlutterwaveCheckout.js +++ b/dist/FlutterwaveCheckout.js @@ -59,7 +59,7 @@ var FlutterwaveCheckout = function FlutterwaveCheckout(props) { Alert.alert('', 'Are you sure you want to cancel this payment?', [ { text: 'No' }, { - text: 'Yes, Cancel', + text: 'Yes', style: 'destructive', onPress: function () { return handleAbort(true); } }, From c26019bc0197ff3c77c6f948950547e9582c76f6 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 31 Aug 2025 15:55:42 +0300 Subject: [PATCH 10/13] Update FlutterwaveCheckout.js --- dist/FlutterwaveCheckout.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dist/FlutterwaveCheckout.js b/dist/FlutterwaveCheckout.js index 48b3e8f..43183df 100644 --- a/dist/FlutterwaveCheckout.js +++ b/dist/FlutterwaveCheckout.js @@ -67,7 +67,8 @@ var FlutterwaveCheckout = function FlutterwaveCheckout(props) { return; } // remove tx_ref and dismiss - animateOut().then(onAbort); + // animateOut().then(onAbort); + setShow(false); }, [onAbort, animateOut]); var handleNavigationStateChange = React.useCallback(function (ev) { // cregex to check if redirect has occured on completion/cancel From d0c44afb6580d13e4ebe4c82df7bbc7516c1d615 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Sun, 31 Aug 2025 15:56:22 +0300 Subject: [PATCH 11/13] Update FlutterwaveCheckout.tsx --- src/FlutterwaveCheckout.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/FlutterwaveCheckout.tsx b/src/FlutterwaveCheckout.tsx index 795b8d7..302e9a4 100644 --- a/src/FlutterwaveCheckout.tsx +++ b/src/FlutterwaveCheckout.tsx @@ -105,11 +105,12 @@ const FlutterwaveCheckout: React.FC = function Flutter // remove tx_ref and dismiss // animateOut() - if(onAbort){ - setTimeout(() => { - onAbort(); - }, 500); - } + // if(onAbort){ + // setTimeout(() => { + // onAbort(); + // }, 500); + // } + setShow(false); }, [onAbort, animateOut]); const handleNavigationStateChange = React.useCallback((ev: WebViewNavigation): boolean => { From 67f8e3f010d85cb3b4123a98fb419f0ab2247739 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Mon, 1 Sep 2025 00:06:06 +0300 Subject: [PATCH 12/13] Update FlutterwaveCheckout.tsx --- src/FlutterwaveCheckout.tsx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/FlutterwaveCheckout.tsx b/src/FlutterwaveCheckout.tsx index 302e9a4..3a36b32 100644 --- a/src/FlutterwaveCheckout.tsx +++ b/src/FlutterwaveCheckout.tsx @@ -110,7 +110,15 @@ const FlutterwaveCheckout: React.FC = function Flutter // onAbort(); // }, 500); // } - setShow(false); + if (webviewRef.current) { + webviewRef.current.stopLoading(); + } + + // Stop animations + animation.current.stopAnimation(); + + // Close modal after cleanup + setTimeout(() => setShow(false), 50); }, [onAbort, animateOut]); const handleNavigationStateChange = React.useCallback((ev: WebViewNavigation): boolean => { From 84560f5d88c2230d2a4351263dd88c0c4ec02d98 Mon Sep 17 00:00:00 2001 From: Raphael <66886932+raphaelobinna@users.noreply.github.com> Date: Mon, 1 Sep 2025 00:07:23 +0300 Subject: [PATCH 13/13] Update FlutterwaveCheckout.js --- dist/FlutterwaveCheckout.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dist/FlutterwaveCheckout.js b/dist/FlutterwaveCheckout.js index 43183df..8a8ec63 100644 --- a/dist/FlutterwaveCheckout.js +++ b/dist/FlutterwaveCheckout.js @@ -68,7 +68,15 @@ var FlutterwaveCheckout = function FlutterwaveCheckout(props) { } // remove tx_ref and dismiss // animateOut().then(onAbort); - setShow(false); + if (webviewRef.current) { + webviewRef.current.stopLoading(); + } + + // Stop animations + animation.current.stopAnimation(); + + // Close modal after cleanup + setTimeout(() => setShow(false), 50); }, [onAbort, animateOut]); var handleNavigationStateChange = React.useCallback(function (ev) { // cregex to check if redirect has occured on completion/cancel