TW-693 Fix processing hex strings

madfish-solutions · May 30, 2023 · 1d0f9b2 · 1d0f9b2
1 parent f6bc619
commit 1d0f9b2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...ions-confirmation/sign-payload-request-confirmation/sign-payload-request-confirmation.tsx b/...ions-confirmation/sign-payload-request-confirmation/sign-payload-request-confirmation.tsx
@@ -32,10 +32,16 @@ interface Props {
   message: SignPayloadRequestOutput;
 }
 
+const payloadToHex = (payload: string) => {
+  const alreadyHexMatch = payload.match(/^(0x)?([0-9a-fA-F]+)$/);
+
+  return alreadyHexMatch?.[2] ?? char2Bytes(payload);
+};
+
 const approveSignPayloadRequest = (message: SignPayloadRequestOutput) =>
   Shelter.getSigner$(message.sourceAddress).pipe(
     switchMap(signer =>
-      signer.sign(message.signingType === SigningType.RAW ? char2Bytes(message.payload) : message.payload)
+      signer.sign(message.signingType === SigningType.RAW ? payloadToHex(message.payload) : message.payload)
     ),
     switchMap(({ prefixSig }) =>
       BeaconHandler.respond({