Skip to content

Commit

Permalink
Merge branch 'master' into IOAPPX-442-fix-dark-mode-text-on-light-bac…
Browse files Browse the repository at this point in the history
…kgrounds
  • Loading branch information
LeleDallas authored Dec 16, 2024
2 parents e1b4dd6 + 2195185 commit 39debe2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 20 deletions.
2 changes: 2 additions & 0 deletions ts/features/payments/checkout/analytics/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ export const getPaymentAnalyticsEventFromFailureOutcome = (
return "PAYMENT_DUPLICATE_ORDER";
case WalletPaymentOutcomeEnum.PSP_ERROR:
return "PAYMENT_PSP_ERROR";
case WalletPaymentOutcomeEnum.AUTH_REQUEST_ERROR:
return "PAYMENT_500_ERROR";
default:
return outcome;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,9 @@ import { WALLET_WEBVIEW_OUTCOME_SCHEMA } from "../../common/utils/const";
import { storePaymentOutcomeToHistory } from "../../history/store/actions";
import {
WalletPaymentAuthorizePayload,
paymentsDeleteTransactionAction,
paymentsStartPaymentAuthorizationAction
} from "../store/actions/networking";
import {
walletPaymentAuthorizationUrlSelector,
walletPaymentTransactionSelector
} from "../store/selectors/transaction";
import { walletPaymentAuthorizationUrlSelector } from "../store/selectors/transaction";
import {
WalletPaymentOutcome,
WalletPaymentOutcomeEnum
Expand All @@ -41,8 +37,6 @@ export const useWalletPaymentAuthorizationModal = ({
const authorizationUrlPot = useIOSelector(
walletPaymentAuthorizationUrlSelector
);
const transactionPot = useIOSelector(walletPaymentTransactionSelector);

const [isPendingAuthorization, setIsPendingAuthorization] =
React.useState<boolean>(false);
const isLoading = pot.isLoading(authorizationUrlPot);
Expand Down Expand Up @@ -91,13 +85,6 @@ export const useWalletPaymentAuthorizationModal = ({
handleAuthorizationOutcome(
WalletPaymentOutcomeEnum.IN_APP_BROWSER_CLOSED_BY_USER
);
if (pot.isSome(transactionPot)) {
dispatch(
paymentsDeleteTransactionAction.request(
transactionPot.value.transactionId
)
);
}
}
)
),
Expand All @@ -108,7 +95,6 @@ export const useWalletPaymentAuthorizationModal = ({
isLoading,
isPendingAuthorization,
authorizationUrlPot,
transactionPot,
handleAuthorizationResult,
handleAuthorizationOutcome,
dispatch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ describe("Onboarding Analytics", () => {
WalletOnboardingOutcomeEnum.BPAY_NOT_FOUND,
"PAYMENT_ADD_METHOD_BPAY_NOT_FOUND"
],
[
WalletOnboardingOutcomeEnum.PSP_ERROR_ONBOARDING,
"PAYMENT_ADD_METHOD_PSP_ERROR"
],
[WalletOnboardingOutcomeEnum.PSP_ERROR_ONBOARDING, "PAYMENT_PSP_ERROR"],
[WalletOnboardingOutcomeEnum.INVALID_SESSION, "PAYMENT_SESSION_TIMEOUT"],
[WalletOnboardingOutcomeEnum.TIMEOUT, "PAYMENT_SESSION_TIMEOUT"],
[WalletOnboardingOutcomeEnum.GENERIC_ERROR, "PAYMENT_GENERIC_ERROR"],
Expand Down
2 changes: 1 addition & 1 deletion ts/features/payments/onboarding/analytics/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const getOnboardingPaymentMethodOutcomeEvent = (
case WalletOnboardingOutcomeEnum.BPAY_NOT_FOUND:
return "PAYMENT_ADD_METHOD_BPAY_NOT_FOUND";
case WalletOnboardingOutcomeEnum.PSP_ERROR_ONBOARDING:
return "PAYMENT_ADD_METHOD_PSP_ERROR";
return "PAYMENT_PSP_ERROR";
case WalletOnboardingOutcomeEnum.INVALID_SESSION:
case WalletOnboardingOutcomeEnum.TIMEOUT:
return "PAYMENT_SESSION_TIMEOUT";
Expand Down

0 comments on commit 39debe2

Please sign in to comment.