Skip to content

Commit c540b2e

Browse files
authored
fix: update curb to work with version rc40+ and tauri desktop (#100)
* feat: update login flow * feat: add bundle script * feat: deps latest version * feat: dynamic package selection * feat: desktop invitations * fix: login * feat: dms fix * feat: cleanup logs
1 parent dd285bd commit c540b2e

19 files changed

Lines changed: 1339 additions & 325 deletions

File tree

app/.env.example

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
VITE_APPLICATION_ID="9XJ7v8QZyrc4TaKsYukMwMc9jtX8qyX5NNi7FZmczSPP"
2-
VITE_APPLICATION_PATH="https://calimero-only-peers-dev.s3.amazonaws.com/uploads/5b8ca89013859d093c6b49d4ad558335.wasm"
3-
VITE_CONTEXT_ID="8e3bmE7Jhfq11XPuWtSJR6fAXC3QD7a5QhVk28bU8qDV"
1+
VITE_APPLICATION_PACKAGE="com.calimero.curb"
2+
VITE_APPLICATION_ID="37poFMF4VaNgfyeaKdGbiacWsCjySJxrtgakT8EFyVL1"

app/dev-dist/sw.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ define(['./workbox-c6a197bf'], (function (workbox) { 'use strict';
8282
"revision": "3ca0b8505b4bec776b69afdba2768812"
8383
}, {
8484
"url": "index.html",
85-
"revision": "0.7nelul30iak"
85+
"revision": "0.0db41ilv2ek"
8686
}], {});
8787
workbox.cleanupOutdatedCaches();
8888
workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"dependencies": {
2323
"@braintree/sanitize-url": "^7.1.1",
24-
"@calimero-network/calimero-client": "1.23.1",
24+
"@calimero-network/calimero-client": "1.25.0-beta.1",
2525
"@calimero-network/mero-icons": "^0.0.6",
2626
"@calimero-network/mero-ui": "1.4.0",
2727
"@radix-ui/react-accordion": "^1.2.11",

app/pnpm-lock.yaml

Lines changed: 10 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/App.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
import { ToastProvider, useToast } from "./contexts/ToastContext";
1313
import { ToastManager } from "./components/common/ToastManager";
1414
import { extractInvitationFromUrl, saveInvitationToStorage } from "./utils/invitation";
15+
import { StorageHelper } from "./utils/storage";
1516

1617
// Lazy load pages for better performance
1718
const Login = lazy(() => import("./pages/Login"));
@@ -87,7 +88,7 @@ function App() {
8788
<Route
8889
path="/login"
8990
element={
90-
isAuthenticated && isConfigSet ? (
91+
isAuthenticated && isConfigSet && StorageHelper.getItem("chat-username") ? (
9192
<Navigate to="/" replace />
9293
) : (
9394
<Login
@@ -102,7 +103,7 @@ function App() {
102103
element={
103104
isLoading ? (
104105
<LoadingSpinner />
105-
) : isAuthenticated && isConfigSet ? (
106+
) : isAuthenticated && isConfigSet && StorageHelper.getItem("chat-username") ? (
106107
<IdleTimeoutWrapper>
107108
<Home isConfigSet={isConfigSet} />
108109
</IdleTimeoutWrapper>

app/src/api/dataSource/nodeApiDataSource.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
getAuthConfig,
55
type ApiResponse,
66
} from "@calimero-network/calimero-client";
7+
import { getApplicationId } from "../../constants/config";
78
import type {
89
CreateContextProps,
910
CreateContextResponse,
@@ -52,7 +53,7 @@ export class ContextApiDataSource implements NodeApi {
5253
const response = await axios.post(
5354
`${nodeEndpoint}/admin-api/contexts`,
5455
{
55-
applicationId: import.meta.env.VITE_APPLICATION_ID || "",
56+
applicationId: getApplicationId(),
5657
protocol: "near",
5758
initializationParams: byteArray,
5859
},

0 commit comments

Comments
 (0)