remove unnecessary finished status and drop ability to reset to prist…

…ine state.
woocommerce · Dec 19, 2019 · a1bd87c · a1bd87c
1 parent 3f25775
commit a1bd87c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/assets/js/base/hooks/payment-methods/constants.js b/assets/js/base/hooks/payment-methods/constants.js
@@ -1,7 +1,6 @@
 export const STATUS = {
 	PRISTINE: 'pristine',
 	STARTED: 'started',
-	FINISHED: 'finished',
 	ERROR: 'has_error',
 	FAILED: 'failed',
 	SUCCESS: 'success',

diff --git a/assets/js/base/hooks/payment-methods/use-payment-events.js b/assets/js/base/hooks/payment-methods/use-payment-events.js
@@ -12,9 +12,7 @@ const usePaymentEvents = () => {
 	const { paymentStatus, setPaymentStatus } = useState( STATUS.PRISTINE );
 	const dispatch = useMemo(
 		() => ( {
-			pristine: () => setPaymentStatus( STATUS.PRISTINE ),
 			started: () => setPaymentStatus( STATUS.STARTED ),
-			finished: () => setPaymentStatus( STATUS.FINISHED ),
 			error: () => setPaymentStatus( STATUS.ERROR ),
 			failed: () => setPaymentStatus( STATUS.FAILED ),
 			success: () => setPaymentStatus( STATUS.SUCCESS ),
@@ -25,7 +23,10 @@ const usePaymentEvents = () => {
 		() => ( {
 			isPristine: () => paymentStatus === STATUS.PRISTINE,
 			isStarted: () => paymentStatus === STATUS.STARTED,
-			isFinished: () => paymentStatus === STATUS.FINISHED,
+			isFinished: () =>
+				[ STATUS.ERROR, STATUS.FAILED, STATUS.SUCCESS ].includes(
+					paymentStatus
+				),
 			hasError: () => paymentStatus === STATUS.ERROR,
 			hasFailed: () => paymentStatus === STATUS.FAILED,
 			isSuccessful: () => paymentStatus === STATUS.SUCCESS,