Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v0.19.0 #273

Merged
merged 7 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 95 additions & 94 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "hathor-admin",
"version": "0.18.1",
"version": "0.19.0",
"private": true,
"dependencies": {
"@hathor/wallet-lib": "1.4.0",
"axios": "0.17.1",
"@hathor/wallet-lib": "1.8.0",
"axios": "1.7.2",
"bootstrap": "4.6.2",
"d3-selection": "1.4.2",
"d3-zoom": "1.8.3",
Expand Down
6 changes: 4 additions & 2 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import VersionError from './screens/VersionError';
import WebSocketHandler from './WebSocketHandler';
import NanoContractDetail from './screens/nano/NanoContractDetail';
import BlueprintDetail from './screens/nano/BlueprintDetail';
import { apiLoadErrorUpdate, dashboardUpdate, isVersionAllowedUpdate } from "./actions/index";
import { apiLoadErrorUpdate, dashboardUpdate, isVersionAllowedUpdate, updateServerInfo } from "./actions/index";
import { connect } from "react-redux";
import versionApi from './api/version';
import helpers from './utils/helpers';
Expand All @@ -44,6 +44,7 @@ const mapDispatchToProps = dispatch => {
dashboardUpdate: data => dispatch(dashboardUpdate(data)),
isVersionAllowedUpdate: data => dispatch(isVersionAllowedUpdate(data)),
apiLoadErrorUpdate: data => dispatch(apiLoadErrorUpdate(data)),
updateServerInfo: data => dispatch(updateServerInfo(data)),
};
};

Expand All @@ -66,6 +67,7 @@ class Root extends React.Component {
network = 'testnet';
}
hathorLibConfig.setNetwork(network);
this.props.updateServerInfo(data);
this.props.isVersionAllowedUpdate({allowed: helpers.isVersionAllowed(data.version)});
}, (e) => {
// Error in request
Expand Down Expand Up @@ -95,7 +97,7 @@ class Root extends React.Component {
<Router>
<>
<Navigation />
{ this.props.apiLoadError ?
{ this.props.apiLoadError ?
<div className="content-wrapper">
<h3 className="text-danger">Error loading the explorer. Please reload the page to try again.</h3>
</div>
Expand Down
2 changes: 2 additions & 0 deletions src/actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ export const dashboardUpdate = data => ({ type: "dashboard_update", payload: dat
export const isVersionAllowedUpdate = data => ({ type: "is_version_allowed_update", payload: data });

export const apiLoadErrorUpdate = data => ({ type: 'api_load_error_update', payload: data });

export const updateServerInfo = data => ({ type: 'update_server_info', payload: data });
4 changes: 2 additions & 2 deletions src/components/AddressDetailExplorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ class AddressDetailExplorer extends React.Component {
// use has a selected token, we will keep the selected token
selectedToken = this.state.selectedToken;
} else {
const hathorUID = hathorLib.constants.HATHOR_TOKEN_CONFIG.uid
const hathorUID = hathorLib.constants.NATIVE_TOKEN_UID
if (tokens[hathorUID]) {
// If HTR is in the token list of this address, it's the default selection
selectedToken = hathorUID;
Expand Down Expand Up @@ -321,7 +321,7 @@ class AddressDetailExplorer extends React.Component {
}

getSelectedTokenMetadata = (selectedToken) => {
if (selectedToken === hathorLib.constants.HATHOR_TOKEN_CONFIG.uid) {
if (selectedToken === hathorLib.constants.NATIVE_TOKEN_UID) {
this.setState({ metadataLoaded: true });
return;
}
Expand Down
Loading
Loading