Replace the minimal placeholder Toaster with the richer implementation already built on compliance-portal-auth (per-type icons plus warning and info variants, and its stories). Both branches now share the exact same component and app-root wiring, so they converge instead of colliding when they merge. Align App.tsx provider ordering to match. Signed-off-by: Émile Ré <emile@probo.com>
38 lines
1.5 KiB
TypeScript
38 lines
1.5 KiB
TypeScript
// Copyright (c) 2025-2026 Probo Inc <hello@probo.com>.
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
// of this software and associated documentation files (the "Software"), to deal
|
|
// in the Software without restriction, including without limitation the rights
|
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
// copies of the Software, and to permit persons to whom the Software is
|
|
// furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in
|
|
// all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
// SOFTWARE.
|
|
|
|
import { Toast } from "@base-ui/react/toast";
|
|
import { Toaster } from "@probo/ui/src/v2/Toaster/Toaster";
|
|
import { RouterProvider } from "react-router";
|
|
|
|
import { RelayProvider } from "#/lib/relay/RelayProvider";
|
|
import { router } from "#/routes";
|
|
|
|
export function App() {
|
|
return (
|
|
<Toast.Provider>
|
|
<RelayProvider>
|
|
<RouterProvider router={router} />
|
|
</RelayProvider>
|
|
<Toaster />
|
|
</Toast.Provider>
|
|
);
|
|
}
|