Skip to content

Commit

Permalink
Merge branch 'develop' into 1487-react-router-6
Browse files Browse the repository at this point in the history
  • Loading branch information
entrotech authored Nov 8, 2023
2 parents 5e355b8 + b12cfee commit f0b3618
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ const App = ({
path="/termsandconditions"
element={<TermsAndConditionsPage />}
/>

<Route path="/privacypolicy" element={<PrivacyPolicy />} />
<Route path="/unauthorized" element={<Unauthorized />} />
<Route path="/register/:email?" element={<Register />} />
Expand Down
6 changes: 1 addition & 5 deletions client/src/components/TdmCalculationContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ export function TdmCalculationContainer({
const initiateEngine = async () => {
// Only run if engine has been instantiated
if (!engine) return;

try {
let projectResponse = null;
let inputs = {};
Expand Down Expand Up @@ -600,10 +599,6 @@ TdmCalculationContainer.propTypes = {
id: PropTypes.number,
email: PropTypes.string
}),
// classes: PropTypes.object.isRequired,
// location: PropTypes.shape({
// search: PropTypes.string
// }),
hasConfirmedNavTransition: PropTypes.bool,
isOpenNavConfirmModal: PropTypes.bool,
setLoggedInAccount: PropTypes.func,
Expand All @@ -613,3 +608,4 @@ TdmCalculationContainer.propTypes = {
};

export default TdmCalculationContainer;

0 comments on commit f0b3618

Please sign in to comment.