Merge remote-tracking branch 'origin/v3.4' into dev

interface/src/index.tsx

@@ -1,14 +1,15 @@
 import React from 'react';
-import { render } from 'react-dom';
+import ReactDOM from 'react-dom';
 
-import history from './history';
-import { Router } from 'react-router';
+import { BrowserRouter } from 'react-router-dom';
 
 import App from './App';
 
-render(
-  <Router history={history}>
-    <App />
-  </Router>,
+ReactDOM.render(
+  <React.StrictMode>
+    <BrowserRouter>
+      <App />
+    </BrowserRouter>
+  </React.StrictMode>,
   document.getElementById('root')
 );