Merge branch '4' into 5.0

# Conflicts: # client/dist/js/bundle-cms.js # client/src/components/FormField/RegisteredMFAMethodListField/AccountResetUI.js
silverstripe · Apr 27, 2023 · 2a92573 · 2a92573
2 parents 52624bb + a2ea054
commit 2a92573
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/client/dist/js/bundle-cms.js b/client/dist/js/bundle-cms.js
diff --git a/client/src/components/FormField/RegisteredMFAMethodListField/AccountResetUI.js b/client/src/components/FormField/RegisteredMFAMethodListField/AccountResetUI.js
@@ -7,6 +7,12 @@ import LoadingIndicator from '../../LoadingIndicator';
 import CircleDash from '../../Icons/CircleDash';
 import CircleTick from '../../Icons/CircleTick';
 
+/**
+ * regeneratorRuntime is not used explicitly in the code,
+ * but this import is necessary for the async handleSendReset method to work correctly
+ */
+import regeneratorRuntime from 'regenerator-runtime'; // eslint-disable-line
+
 import fallbacks from '../../../../lang/src/en.json';
 
 /**