Skip to content

Commit 883105d

Browse files
committed
fix(about): show correct node status
1 parent 5561386 commit 883105d

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/popup/pages/About.vue

+11-3
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@
5252
</LinkButton>
5353
<LinkButton
5454
class="table-item link"
55-
:to="`${middlewareUrl}/status`"
55+
:to="`${nodeUrl}/v3/status`"
5656
>
5757
<div class="name">
5858
{{ $t('pages.about.node-version') }}
5959
</div>
6060
<div class="value">
61-
{{ middlewareStatus.nodeVersion }}
61+
{{ nodeStatus.node_version }}
6262
<ExternalLink class="compensate-icon-margin" />
6363
</div>
6464
</LinkButton>
@@ -98,6 +98,7 @@ import { BUG_REPORT_URL, AGGREGATOR_URL } from '@/constants';
9898
import { useMiddleware } from '@/composables';
9999
import { AE_COMMIT_URL } from '@/protocols/aeternity/config';
100100
import { useAeNetworkSettings } from '@/protocols/aeternity/composables';
101+
import { fetchJson } from '@/utils';
101102
102103
import LinkButton from '@/popup/components/LinkButton.vue';
103104
import PanelItem from '../components/PanelItem.vue';
@@ -118,11 +119,16 @@ export default defineComponent({
118119
const { fetchMiddlewareStatus } = useMiddleware();
119120
120121
const middlewareStatus = ref<IMiddlewareStatus>();
122+
const nodeStatus = ref(null);
121123
122124
const middlewareUrl = computed(() => aeActiveNetworkSettings.value.middlewareUrl);
125+
const nodeUrl = computed(() => aeActiveNetworkSettings.value.nodeUrl);
123126
124127
onMounted(async () => {
125-
middlewareStatus.value = await fetchMiddlewareStatus();
128+
[middlewareStatus.value, nodeStatus.value] = await Promise.all([
129+
fetchMiddlewareStatus(),
130+
fetchJson(`${nodeUrl.value}/v3/status`),
131+
]);
126132
});
127133
128134
return {
@@ -135,6 +141,8 @@ export default defineComponent({
135141
sdkVersion: process.env.SDK_VERSION,
136142
middlewareStatus,
137143
middlewareUrl,
144+
nodeStatus,
145+
nodeUrl,
138146
};
139147
},
140148
});

tests/unit/snapshot.spec.js

+3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ jest.mock('../../src/composables', () => ({
3333
openModal: jest.fn(),
3434
})),
3535
}));
36+
jest.mock('@/utils', () => ({
37+
fetchJson: jest.fn(() => ({})),
38+
}));
3639
jest.mock('vue-router', () => ({
3740
useRouter: jest.fn(() => ({})),
3841
}));

0 commit comments

Comments
 (0)