Merge branch 'main' into fix/transfer-uppercase

cartridge-gg · Dec 21, 2024 · 275cca3 · 275cca3
2 parents cb5fc9e + 69f5a1c
commit 275cca3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/packages/keychain/src/components/ExecutionContainer.tsx b/packages/keychain/src/components/ExecutionContainer.tsx
@@ -72,7 +72,7 @@ export function ExecutionContainer({
   );
 
   useEffect(() => {
-    if (!!ctrlError || maxFee !== null || !transactions.length) {
+    if (!!ctrlError || maxFee !== null || !transactions?.length) {
       return;
     }
 
@@ -200,7 +200,9 @@ export function ExecutionContainer({
                     colorScheme="colorful"
                     onClick={handleSubmit}
                     isLoading={isLoading}
-                    isDisabled={maxFee === null && transactions.length}
+                    isDisabled={
+                      !transactions || (maxFee === null && transactions?.length)
+                    }
                   >
                     {buttonText}
                   </Button>

diff --git a/packages/keychain/src/components/app.tsx b/packages/keychain/src/components/app.tsx
@@ -5,7 +5,7 @@ import { Session } from "./session";
 import { Failure } from "./failure";
 import { Success } from "./success";
 import { Pending } from "./pending";
-import { Slot } from "./slot";
+import { Consent, Slot } from "./slot";
 
 export function App() {
   return (
@@ -14,6 +14,7 @@ export function App() {
       <Route path="authenticate" element={<Authenticate />} />
       <Route path="session" element={<Session />} />
       <Route path="slot" element={<Slot />} />
+      <Route path="slot/consent" element={<Consent />} />
       <Route path="success" element={<Success />} />
       <Route path="failure" element={<Failure />} />
       <Route path="pending" element={<Pending />} />

diff --git a/packages/keychain/src/components/connect/RegisterSession.tsx b/packages/keychain/src/components/connect/RegisterSession.tsx
@@ -52,7 +52,7 @@ export function RegisterSession({
 
   const onRegisterSession = useCallback(
     async (maxFee?: bigint) => {
-      if (!maxFee || !publicKey || !controller) {
+      if (maxFee == undefined || !publicKey || !controller) {
         return;
       }
 

diff --git a/packages/keychain/src/components/session.tsx b/packages/keychain/src/components/session.tsx
@@ -71,7 +71,10 @@ export function Session() {
           const url = sanitizeCallbackUrl(
             decodeURIComponent(queries.callback_uri),
           );
-          if (!url) return;
+          if (!url) {
+            return;
+          }
+
           const res = await fetch(url, {
             body: encodedResponse,
             headers,
@@ -99,7 +102,7 @@ export function Session() {
       if (queries.redirect_uri) {
         const url = decodeURIComponent(queries.redirect_uri);
         const query_name = queries.redirect_query_name ?? "session";
-        navigate(`${url}?${query_name}=${encodedResponse}`, { replace: true });
+        window.location.href = `${url}?${query_name}=${encodedResponse}`;
       }
     },
     [navigate, queries],

diff --git a/packages/keychain/src/components/session/UnverifiedSessionSummary.tsx b/packages/keychain/src/components/session/UnverifiedSessionSummary.tsx
@@ -27,7 +27,7 @@ export function UnverifiedSessionSummary({
         );
       })}
 
-      {policies.messages?.length && (
+      {policies.messages && policies.messages.length > 0 && (
         <MessageCard messages={policies.messages} />
       )}
     </div>

diff --git a/packages/keychain/src/components/slot/consent.tsx b/packages/keychain/src/components/slot/consent.tsx
@@ -25,7 +25,7 @@ export function Consent() {
 
   useEffect(() => {
     if (!Controller.fromStore(import.meta.env.VITE_ORIGIN!)) {
-      navigate("/slot", { replace: true });
+      navigate("/slot/auth", { replace: true });
     }
   }, [navigate]);
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ export function UnverifiedSessionSummary({ @@
             );
           })}
-          {policies.messages?.length && (
+          {policies.messages && policies.messages.length > 0 && (
             <MessageCard messages={policies.messages} />
           )}
         </div>
@@ Expand Down @@