Merge commit '93a7da833752e0899d15efe4a21e7abd72e81b45' into DATAP-13…

…35-deprecate-redux-mock-store # Conflicts: # dist/ccdb5.js # dist/ccdb5.js.map # src/App.js # src/components/ActionBar/ActionBar.js
cfpb · Sep 26, 2024 · d9c54c7 · d9c54c7
2 parents 9c183a3 + 93a7da8
commit d9c54c7
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 77 deletions.
diff --git a/dist/ccdb5.js b/dist/ccdb5.js
diff --git a/dist/ccdb5.js.map b/dist/ccdb5.js.map
diff --git a/package.json b/package.json
@@ -95,7 +95,6 @@
     "react-bootstrap": "^2.6.0",
     "react-bootstrap-typeahead": "^6.3.2",
     "react-dom": "^18.2.0",
-    "react-intl": "^6.6.6",
     "react-modal": "^3.16.1",
     "react-redux": "^7.2.0",
     "react-router-dom": "^6.23.1",

diff --git a/src/components/ActionBar/ActionBar.js b/src/components/ActionBar/ActionBar.js
@@ -2,13 +2,14 @@ import './ActionBar.less';
 import { useDispatch, useSelector } from 'react-redux';
 import getIcon from '../iconMap';
 import { sendAnalyticsEvent } from '../../utils';
-import { printModeOn, showModal } from '../../actions';
+import { showModal } from '../../actions/view';
 import { StaleDataWarnings } from '../Warnings/StaleDataWarnings';
 import {
   selectAggsDocCount,
   selectAggsTotal,
 } from '../../reducers/aggs/selectors';
 import { selectQueryTab } from '../../reducers/query/selectors';
+import { printModeOn } from '../../actions/view';
 import { MODAL_TYPE_DATA_EXPORT } from '../../constants';
 
 export const ActionBar = () => {
@@ -24,21 +25,20 @@ export const ActionBar = () => {
   return (
     <div>
       <summary className="action-bar" id="search-summary">
-        <div>
-          {total === docCount ? (
-            <h2>
-              {'Showing ' + docCount.toLocaleString() + ' total complaints'}
-            </h2>
-          ) : (
-            <h2>
-              {'Showing ' +
-                total.toLocaleString() +
-                ' matches out of ' +
-                docCount.toLocaleString() +
-                ' total complaints'}
-            </h2>
-          )}
-        </div>
+        {total === docCount ? (
+          <h2>
+            {'Showing ' + docCount.toLocaleString() + ' total complaints'}
+          </h2>
+        ) : (
+          <h2>
+            {'Showing ' +
+              total.toLocaleString() +
+              ' matches out of ' +
+              docCount.toLocaleString() +
+              ' total complaints'}
+          </h2>
+        )}
+
         <div>
           <h3 className="h4 flex-all export-results">
             <button