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

dismiss dialog on hot reload #198

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

dismiss dialog on hot reload #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/src/main/java/com/adyenreactnativesdk/action/ActionHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class ActionHandler(
}
}

fun hide(activity: FragmentActivity) {
fun hide() {
dialog.get()?.dismiss()
dialog.clear()
loadedComponent = null
Expand Down
4 changes: 4 additions & 0 deletions android/src/main/java/com/adyenreactnativesdk/component/BaseModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ abstract class BaseModule(context: ReactApplicationContext?) : ReactContextBaseJ

protected var actionHandler: ActionHandler? = null

override fun onCatalystInstanceDestroy() {
actionHandler?.hide()
}

protected fun sendEvent(eventName: String, map: ReadableMap?) {
reactApplicationContext
.getJSModule(RCTDeviceEventEmitter::class.java)
Expand Down
4 changes: 4 additions & 0 deletions android/src/main/java/com/adyenreactnativesdk/component/googlepay/AdyenGooglePayComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ class AdyenGooglePayComponent(context: ReactApplicationContext?) : BaseModule(co
return COMPONENT_NAME
}

override fun onCatalystInstanceDestroy() {
pendingPaymentDialogFragment?.dismiss()
}

@ReactMethod
fun addListener(eventName: String?) { /* No JS events expected */ }

Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/com/adyenreactnativesdk/component/instant/AdyenInstantComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class AdyenInstantComponent(context: ReactApplicationContext?) : BaseModule(cont
@ReactMethod
fun hide(success: Boolean?, message: ReadableMap?) {
appCompatActivity.runOnUiThread {
actionHandler?.hide(appCompatActivity)
actionHandler?.hide()
actionHandler = null
AdyenCheckout.removeIntentHandler()
}
Expand Down