ui modal + types

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockin",
-  "version": "1.2.107",
+  "version": "1.2.114",
   "description": "",
   "files": [
     "dist"
@@ -32,7 +32,7 @@
     "build:ui": "rollup --config ./ui-rollup.config.js && npm run postuirollup",
     "build:core": "rollup --config ./rollup.config.js && npm run postcorerollup",
     "postcorerollup": "cp ./dist/index.d.ts ./dist/index.d.cts",
-    "postuirollup": "mv ./dist/index*  ./dist/ui && cp ./dist/ui/index.d.ts ./dist/ui/index.d.cts",
+    "postuirollup": "mv ./dist/index.js*  ./dist/ui && mv ./dist/index.cjs*  ./dist/ui && cp ./dist/ui/index.d.ts ./dist/ui/index.d.cts",
     "storybook": "storybook dev -p 6006",
     "storybook:export": "storybook build",
     "build-storybook": "storybook build"

src/types/ChainDriver.types.ts

@@ -19,7 +19,7 @@ export interface IGetPublicKey { (address: string): Uint8Array }
 export interface IGetAssetDetails { (txnId: string): Promise<any> }
 export interface ILookupTransactionById { (txnId: string): Promise<any> }
 export interface IGetChallengeStringFromBytesToSign { (originalBytes: Uint8Array): Promise<string> }
-export interface IVerifySignature { (message: string, signature: string): Promise<void> }
+export interface IVerifySignature { (message: string, signature: string, publicKey?: string): Promise<void> }
 export interface IVerifyAssets<T extends NumberType> {
   (address: string, resources: string[], assets: AssetConditionGroup<T> | undefined, balancesSnapshot?: object): Promise<any>
 }

src/types/verify.types.ts

@@ -1,4 +1,5 @@
-export type NumberType = string | bigint | number | boolean;
+export type NumberType = string | bigint | number;
+
 export interface UintRange<T extends NumberType> {
   start: T,
   end: T,
@@ -106,9 +107,9 @@ export function convertAssetConditionGroup<T extends NumberType, U extends Numbe
       options: ownershipRequirements.options ? {
         numMatchesForVerification:
           ownershipRequirements.options.numMatchesForVerification ? convertFunction(ownershipRequirements.options.numMatchesForVerification) :
-            populateDefaults ? 0 as U : undefined
+            populateDefaults ? convertFunction(0 as T) : undefined
       } : populateDefaults ? {
-        numMatchesForVerification: 0 as U
+        numMatchesForVerification: convertFunction(0 as T)
       } : undefined
     }
   }

src/ui/BlockinUIDisplay/BlockinUIDisplay.stories.tsx

@@ -180,6 +180,7 @@ export const SuccessfulSignAndVerify = () => {
       // }
       // ]}
       allowTimeSelect
+      skipModalStep
     />
   </div>
 }

src/ui/BlockinUIDisplay/BlockinUIDisplay.tsx

@@ -9,6 +9,7 @@ import { CopyOutlined, InfoCircleOutlined } from "@ant-design/icons";
 import { Typography, Tooltip } from "antd";
 import "./BlockinUIDisplay.scss";
 import { NumberType } from "../../types/verify.types";
+import { createChallenge } from "../..";
 
 const Link = ({ url, text }: { url: string, text?: string }) => {
   return <a className="blockin-link" href={url} target='_blank' rel="noreferrer">{text ? text : url}</a>
@@ -44,7 +45,8 @@ const BlockinUIDisplay: React.FC<BlockinUIDisplayProps<NumberType>> = ({
   hideConnectVsSignInHelper,
   allowTimeSelect,
   maxTimeInFuture,
-  customBeforeSigningWarning
+  customBeforeSigningWarning,
+  skipModalStep,
 
 }) => {
   const [signInModalIsVisible, setSignInModalIsVisible] = useState(false);
@@ -165,8 +167,20 @@ const BlockinUIDisplay: React.FC<BlockinUIDisplayProps<NumberType>> = ({
             </button> :
             <>{connected &&
               <button className='blockin-button main-button main-display button-style-override' style={buttonStyle} onClick={
-                () => setSignInModalIsVisible(!signInModalIsVisible)
-              }>
+                async () => {
+                  if (skipModalStep) {
+                    if (!challengeParams) {
+                      throw new Error('You must provide challengeParams')
+                    }
+                    if (!signAndVerifyChallenge) {
+                      throw new Error('You must provide signAndVerifyChallenge')
+                    }
+
+                    await signAndVerifyChallenge(createChallenge(challengeParams));
+                  } else {
+                    setSignInModalIsVisible(!signInModalIsVisible)
+                  }
+                }}>
                 Sign In
               </button>
             }</>

src/ui/BlockinUIDisplay/BlockinUIDisplay.types.ts

@@ -204,4 +204,10 @@ export type BlockinUIDisplayProps<T extends NumberType> = {
     * Provide a warning, such as other sites that the signature / authentication code will be given to (i.e. other sites that are to be trusted).
     */
   customBeforeSigningWarning?: string
+
+
+  /**
+   * If true, the modal will not be displayed. We go directly to prompt the user to sign the challenge.
+   */
+  skipModalStep?: boolean
 }

src/ui/SignInModal/SignInModal.stories.tsx

@@ -67,6 +67,7 @@ export const SuccessfulSignAndVerify = () => {
       setModalIsVisible={setModalIsVisible}
       selectedChainName={chain}
       address={'0xe00dd9d317573f7b4868d8f2578c65544b153a27'}
+      nonWalletSignIn
       customBeforeSigningWarning="This sign-in will also be given to the parent window that sent you here."
       signAndVerifyChallenge={async (challenge: string) => {
         const signChallengeResponse = await handleSignChallengeSuccess(challenge);