@rango-dev/widget-embedded 0.12.1-next.22 → 0.12.1-next.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.12.1-next.22",
+  "version": "0.12.1-next.24",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -23,7 +23,7 @@
     "@rango-dev/queue-manager-core": "^0.15.1-next.2",
     "@rango-dev/queue-manager-rango-preset": "^0.15.1-next.6",
     "@rango-dev/queue-manager-react": "^0.15.1-next.4",
-    "@rango-dev/ui": "^0.15.1-next.13",
+    "@rango-dev/ui": "^0.15.1-next.14",
     "@rango-dev/wallets-react": "^0.1.1-next.6",
     "@rango-dev/wallets-shared": "^0.15.1-next.4",
     "bignumber.js": "^9.1.1",

package/src/components/AppRouter.tsx

@@ -17,20 +17,19 @@ import { UpdateUrl } from './UpdateUrl';
 function Route(props: PropsWithChildren) {
   const location = useLocation();
   const navigate = useNavigate();
-  const ref = useRef(true);
+  const firstRender = useRef(true);
+  const paths = location.pathname.split('/');
+  const pathMatched = paths[paths.length - 1] === navigationRoutes.confirmSwap;
+  const shouldRedirectToMainPage = pathMatched && firstRender.current;
 
   useEffect(() => {
-    if (
-      location.pathname === '/' + navigationRoutes.confirmSwap &&
-      ref.current
-    ) {
-      navigate(navigationRoutes.home + location.search, { state: 'redirect' });
+    if (shouldRedirectToMainPage) {
+      navigate('.');
     }
-
-    ref.current = false;
+    firstRender.current = false;
   }, []);
 
-  if (location.pathname === '/' + navigationRoutes.confirmSwap && ref.current) {
+  if (shouldRedirectToMainPage) {
     return <Home />;
   }
 

package/src/components/SwapDetails/SwapDetails.styles.ts

@@ -61,7 +61,7 @@ export const PlaceholderContainer = styled('div', {
   height: '450px',
   display: 'flex',
   alignItems: 'center',
-  textAlign: 'center',
+  justifyContent: 'center',
 });
 
 export const LoaderContainer = styled('div', {