Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tjayrush committed Nov 25, 2023
2 parents 28fdd4f + c665d60 commit e7cded9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"react-syntax-highlighter": "^15.4.3",
"react-test-renderer": "^17.0.2",
"recharts": "^2.0.9",
"trueblocks-sdk": "^1.0.1",
"trueblocks-sdk": "^2.1.0",
"ts-morph": "^13.0.2"
}
}
4 changes: 3 additions & 1 deletion src/ui/State.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,12 @@ export const useGlobalState2 = () => {
const apiProvider = new URL(process.env.CORE_URL || 'http://localhost:8080');
const host = apiProvider.hostname;
const port = parseInt(apiProvider.port, 10);

return ({
host,
port,
apiProvider: apiProvider.href,
// Remove trailing slash if any
apiProvider: apiProvider.href.replace(/\/$/, ''),
});
};

Expand Down
1 change: 1 addition & 0 deletions src/ui/modules/types/models/Transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ export type TransactionModel =
toName?: Name,
staging: boolean,
chain: string,
extraData?: string,
}

0 comments on commit e7cded9

Please sign in to comment.