Merge branch 'develop' into develop_ui-improvements

Author: saajand

Dockerfile

@@ -9,9 +9,7 @@ RUN npm i -g serve
 COPY . .
 COPY .env .
 
-RUN npm run build
-
 EXPOSE 3010
 
 # Specify the command to run your application
-CMD ["serve", "-s", "-p", "3010", "dist"]
+CMD ["npm", "run", "dev"]

docker-compose.yml

@@ -6,3 +6,5 @@ services:
     container_name: multisig-frontend
     ports:
       - '3010:3010'
+    env_file:
+      - .env

src/components/CosmosProposalsTable.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { convertTimestampToDateTime } from '../utils/dateTimeUtils';
 import { Proposal } from '../@types/CosmosProposalsTypes';
 import { Link } from 'react-router-dom';
+import { useAppContext } from '../context/AppContext';
 
 interface CosmosProposalsPageProps {
   proposals: Proposal[];
@@ -23,6 +24,8 @@ const CosmosProposalsPage: React.FC<CosmosProposalsPageProps> = ({
   executeAction,
 }) => {
   const currentPage = parseInt(`${offset / limit}`) + 1;
+  const { state } = useAppContext();
+  const chainName = state.activeCosmosChain.chainName;
 
   return (
     <>
@@ -67,7 +70,7 @@ const CosmosProposalsPage: React.FC<CosmosProposalsPageProps> = ({
                   </div>
                 </td>
                 <td>
-                  <Link to={`/cosmos/proposals/${proposal.id}`}>
+                  <Link to={`/cosmos/proposals/${chainName}/${proposal.id}`}>
                     <button className="d-btn">Details</button>
                   </Link>
                 </td>