Merge branch 'master' into contribute

2 files changed, 6 insertions, 7 deletions

diff --git a/src/components/SolutionCard/SolutionCard.js b/src/components/SolutionCard/SolutionCard.js
index 7cca74c..1fff873 100644
--- a/src/components/SolutionCard/SolutionCard.js
+++ b/src/components/SolutionCard/SolutionCard.js
@@ -54,9 +54,10 @@ const SolutionCard = ({ data, removeThisCard }) => {
   };
 
   const handleDelete = () => {
-    del(`solutions/${data.id}/`);
+    del(`solutions/${data.id}/`).then(() => {
+      removeThisCard(data.id);
+    });
     handleClose();
-    removeThisCard(data.id);
   };
 
   return (
diff --git a/src/pages/Scoreboard/Scoreboard.js b/src/pages/Scoreboard/Scoreboard.js
index 61275c1..29d26c8 100644
--- a/src/pages/Scoreboard/Scoreboard.js
+++ b/src/pages/Scoreboard/Scoreboard.js
@@ -28,18 +28,16 @@ const Scoreboard = () => {
 
   const updateSolutions = () => {
     get('scoreboard/').then(response => {
-      setTimeout(() => {
         setSolutions(response.data);
-      }, 300);
     });
   };
 
-  const removeSolution = (id) => {
-    setSolutions(solutions.filter((solution => solution.id !== id)));
+  const removeSolution = id => {
+    updateSolutions();
   };
 
   useEffect(() => {
-    updateSolutions();
+    setTimeout(updateSolutions, 300);
   }, []);
 
   const renderItem = ({ index, style }) => {