Revert "feature: updates core dependencies (where feasible) (#1956)" (#…

…1957) This reverts commit 097df4b.
CityOfZion · Apr 7, 2020 · c0c0a57 · c0c0a57
1 parent 097df4b
commit c0c0a57
Show file tree

Hide file tree

Showing 54 changed files with 1,014 additions and 2,176 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -26,7 +26,7 @@
     "test": true,
     "it": true
   },
-  "plugins": ["prettier", "react", "react-hooks", "flowtype", "import"],
+  "plugins": ["prettier", "react", "flowtype", "import"],
   "rules": {
     "no-new": 0,
     "no-shadow": 0,
@@ -74,8 +74,7 @@
     "flowtype/generic-spacing": 0,
     "no-param-reassign": ["warn"],
     "no-restricted-syntax": ["error", "LabeledStatement", "WithStatement"],
-    "no-await-in-loop": 0,
-    "camelcase": 0
+    "no-await-in-loop": 0
   },
   "settings": {
     "import/resolver": {

diff --git a/__tests__/components/Modals/__snapshots__/ConfirmModal.test.js.snap b/__tests__/components/Modals/__snapshots__/ConfirmModal.test.js.snap
@@ -61,7 +61,6 @@ exports[`ConfirmModal should render without crashing 1`] = `
         onRequestClose={[Function]}
         parentSelector={[Function]}
         portalClassName="ReactModalPortal"
-        role="dialog"
         shouldCloseOnEsc={true}
         shouldCloseOnOverlayClick={true}
         shouldFocusAfterRender={true}
@@ -289,7 +288,6 @@ exports[`ConfirmModal should render without crashing 1`] = `
               >
                 <div
                   class="ReactModal__Content ReactModal__Content--after-open"
-                  role="dialog"
                   style="position: absolute; top: 40px; left: 40px; right: 40px; bottom: 40px; overflow: auto; border-radius: 4px; outline: none; padding: 0px; width: 500px; height: 200px; margin: auto; box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 4px; display: flex; flex-direction: column;"
                   tabindex="-1"
                 >
@@ -371,7 +369,6 @@ exports[`ConfirmModal should render without crashing 1`] = `
             onRequestClose={[Function]}
             parentSelector={[Function]}
             portalClassName="ReactModalPortal"
-            role="dialog"
             shouldCloseOnEsc={true}
             shouldCloseOnOverlayClick={true}
             shouldFocusAfterRender={true}
@@ -592,6 +589,7 @@ exports[`ConfirmModal should render without crashing 1`] = `
               className="ReactModal__Overlay ReactModal__Overlay--after-open"
               onClick={[Function]}
               onMouseDown={[Function]}
+              onMouseUp={[Function]}
               style={
                 Object {
                   "--amounts-panel-asset-amount-text": "#515151",
@@ -705,7 +703,6 @@ exports[`ConfirmModal should render without crashing 1`] = `
                 onKeyDown={[Function]}
                 onMouseDown={[Function]}
                 onMouseUp={[Function]}
-                role="dialog"
                 style={
                   Object {
                     "--amounts-panel-asset-amount-text": "#515151",

diff --git a/__tests__/components/Sidebar.test.js b/__tests__/components/Sidebar.test.js
@@ -103,8 +103,7 @@ describe('Sidebar', () => {
     expect(label.text()).toEqual(' Token Sale ')
 
     const container = wrapper.find('#tokensale')
-
-    expect(container.length).toEqual(4)
+    expect(container.length).toEqual(3)
   })
 
   test('does not render the token sale navigation option when in watch only mode', () => {

diff --git a/__tests__/components/__snapshots__/NetworkConfigurationTooltip.test.js.snap b/__tests__/components/__snapshots__/NetworkConfigurationTooltip.test.js.snap
@@ -609,40 +609,36 @@ exports[`Sidebar renders without crashing 1`] = `
                                         className="buttonContainer"
                                       >
                                         <Link
+                                          replace={false}
                                           to="/network-configuration"
                                         >
-                                          <LinkAnchor
+                                          <a
                                             href="#/network-configuration"
-                                            navigate={[Function]}
+                                            onClick={[Function]}
                                           >
-                                            <a
-                                              href="#/network-configuration"
-                                              onClick={[Function]}
+                                            <Button
+                                              primary={false}
+                                              renderIcon={[Function]}
+                                              shouldCenterButtonLabelText={true}
+                                              type="button"
                                             >
-                                              <Button
-                                                primary={false}
-                                                renderIcon={[Function]}
-                                                shouldCenterButtonLabelText={true}
+                                              <button
+                                                className="button light"
                                                 type="button"
                                               >
-                                                <button
-                                                  className="button light"
-                                                  type="button"
+                                                <span
+                                                  className="icon centeredLabel dark"
                                                 >
-                                                  <span
-                                                    className="icon centeredLabel dark"
-                                                  >
-                                                    <Component>
-                                                      <svg />
-                                                    </Component>
-                                                  </span>
-                                                  <span>
-                                                    Update Settings
-                                                  </span>
-                                                </button>
-                                              </Button>
-                                            </a>
-                                          </LinkAnchor>
+                                                  <Component>
+                                                    <svg />
+                                                  </Component>
+                                                </span>
+                                                <span>
+                                                  Update Settings
+                                                </span>
+                                              </button>
+                                            </Button>
+                                          </a>
                                         </Link>
                                       </div>
                                     </div>