Skip to content

Commit 6427f5e

Browse files
committed
frontend/frame: load secret in frame component.
This ensures that a spinner is shown all the time.
1 parent b6686e4 commit 6427f5e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

frontend/src/components/Frame.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Message, MessageType, SetupMessage } from '../types';
33
import Worker from '../worker?worker'
44
import { Row, Spinner } from 'react-bootstrap';
55
import { setAppNavigation } from './Navbar';
6-
import { enableLogging, refresh_access_token, secret } from '../utils';
6+
import { enableLogging, get_decrypted_secret, secret } from '../utils';
77
import Median from "median-js-bridge";
88
import i18n from '../i18n';
99
import { ChargersState } from '../pages/chargers';
@@ -87,7 +87,10 @@ class VirtualNetworkInterface {
8787
}
8888

8989
// This waits for the Worker to be done with the setup
90-
setupHandler(e: MessageEvent) {
90+
async setupHandler(e: MessageEvent) {
91+
if (!secret) {
92+
await get_decrypted_secret();
93+
}
9194
if (e.data === "started") {
9295
this.worker.onmessage = (e) => this.handleWorkerMessage(e);
9396
const message_data: SetupMessage = {

frontend/src/pages/chargers.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ export function ChargerList() {
4141
const [loaded, setLoaded] = useState(false);
4242

4343
if (Median.isNativeApp() && !loaded) {
44-
setTimeout(async () => {
45-
if (!secret) {
46-
await get_decrypted_secret();
47-
}
44+
setTimeout(() => {
4845
const currentConnection = sessionStorage.getItem("currentConnection");
4946
try {
5047
const currentConnectionObject: ChargersState = JSON.parse(currentConnection);

0 commit comments

Comments
 (0)