[WT-1501] Make minor, patch, prerelase optional for checkout sdk versions (#872)

Author: deepti-imx

packages/checkout/widgets-lib/src/views/top-up/TopUpView.cy.tsx

@@ -341,8 +341,13 @@ describe('Top Up View', () => {
         </ConnectLoaderTestComponent>,
       );
 
+      cySmartGet('menu-item-caption-swap').contains('Using the coins I have on the same network');
       cySmartGet('menu-item-caption-swap').contains('$0.20 USD');
+
+      cySmartGet('menu-item-caption-bridge').contains('From the coins I have on a different network');
       cySmartGet('menu-item-caption-bridge').contains('$0.40 USD');
+
+      cySmartGet('menu-item-caption-onramp').contains('Google pay & Apple pay available. Minimum $5.');
       cySmartGet('menu-item-caption-onramp').contains('3.5% to 5.5%');
     });
 

packages/checkout/widgets-lib/src/views/top-up/TopUpView.tsx

@@ -249,7 +249,7 @@ export function TopUpView({
             testId="onramp"
             icon="Wallet"
             heading={onramp.heading}
-            caption={onramp.heading}
+            caption={onramp.caption}
             subcaption={onramp.subcaption}
             onClick={onClickOnRamp}
             renderFeeFunction={() => renderFeePercentage(onRampFeesPercentage, loadingOnRampFees)}
@@ -260,7 +260,7 @@ export function TopUpView({
               testId="swap"
               icon="Coins"
               heading={swap.heading}
-              caption={swap.heading}
+              caption={swap.caption}
               subcaption={swap.subcaption}
               onClick={onClickSwap}
               renderFeeFunction={() => renderFees(swapFeesInFiat, loadingSwapFees)}

packages/checkout/widgets/src/CheckoutWidgets.test.ts

@@ -31,32 +31,82 @@ describe('CheckoutWidgets', () => {
         expectedVersion: SDK_VERSION,
       },
       {
-        title: 'undefined minor should return default version',
+        title: 'undefined minor should return major version',
         version: {
           major: 1,
-          minor: undefined as unknown as number,
+          minor: undefined,
           patch: 1,
           prerelease: 'alpha',
         },
-        expectedVersion: SDK_VERSION,
+        expectedVersion: '1',
       },
       {
-        title: 'undefined patch should return default version',
+        title: 'undefined patch should return major.minor version',
         version: {
           major: 1,
           minor: 1,
-          patch: undefined as unknown as number,
+          patch: undefined,
           prerelease: 'alpha',
         },
-        expectedVersion: SDK_VERSION,
+        expectedVersion: '1.1',
+      },
+      {
+        title: 'undefined patch with zero minor should return major.minor version',
+        version: {
+          major: 1,
+          minor: 0,
+          patch: undefined,
+          prerelease: 'alpha',
+        },
+        expectedVersion: '1.0',
       },
       {
-        title: 'undefined prerelease should return default version',
+        title: 'Minor and patch zero values should return in version number',
+        version: {
+          major: 1,
+          minor: 0,
+          patch: 0,
+          prerelease: undefined,
+        },
+        expectedVersion: '1.0.0',
+      },
+      {
+        title: 'non-alpha prerelease should return major.minor.patch version',
+        version: {
+          major: 1,
+          minor: 0,
+          patch: 0,
+          prerelease: 'test' as 'alpha',
+        },
+        expectedVersion: '1.0.0',
+      },
+      {
+        title: 'undefined prerelease should return major.minor.patch version',
         version: {
           major: 1,
           minor: 1,
           patch: 1,
-          prerelease: undefined as unknown as 'alpha',
+          prerelease: undefined,
+        },
+        expectedVersion: '1.1.1',
+      },
+      {
+        title: 'zero major version and rest are all undefined should return default version',
+        version: {
+          major: 0,
+          minor: undefined,
+          patch: undefined,
+          prerelease: undefined,
+        },
+        expectedVersion: SDK_VERSION,
+      },
+      {
+        title: 'major and minor as zeros and patch undefined should return default version',
+        version: {
+          major: 0,
+          minor: 0,
+          patch: undefined,
+          prerelease: undefined,
         },
         expectedVersion: SDK_VERSION,
       },
@@ -71,14 +121,14 @@ describe('CheckoutWidgets', () => {
         expectedVersion: SDK_VERSION,
       },
       {
-        title: 'invalid prerelease should return default version',
+        title: 'invalid prerelease should return major.minor.patch version',
         version: {
           major: 0,
           minor: 1,
           patch: 0,
           prerelease: 'test' as 'alpha',
         },
-        expectedVersion: SDK_VERSION,
+        expectedVersion: '0.1.0',
       },
       {
         title: 'provided prerelease should be appended to version',

packages/checkout/widgets/src/CheckoutWidgets.ts

@@ -12,45 +12,41 @@ export function validateAndBuildVersion(
 ): string {
   const defaultPackageVersion = globalPackageVersion();
 
-  if (version === undefined) return defaultPackageVersion;
-
-  // Pre-production release
-  // TODO: https://immutable.atlassian.net/browse/WT-1501
-  if (
-    version.major === undefined
-    || version.minor === undefined
-    || version.patch === undefined
-    || version.prerelease === undefined
-  ) return defaultPackageVersion;
-
-  if (version.major < 0) return defaultPackageVersion;
-  if (version.minor < 0) return defaultPackageVersion;
-  if (version.patch < 0) return defaultPackageVersion;
-  if (version.prerelease !== 'alpha') return defaultPackageVersion;
+  if (version === undefined || version.major === undefined) return defaultPackageVersion;
 
+  if (!Number.isInteger(version.major) || version.major < 0) return defaultPackageVersion;
+  if (version.minor !== undefined && version.minor < 0) return defaultPackageVersion;
+  if (version.patch !== undefined && version.patch < 0) return defaultPackageVersion;
+
+  if (version.major === 0 && version.minor === undefined) return defaultPackageVersion;
+  if (version.major === 0 && version.minor === 0 && version.patch === undefined) return defaultPackageVersion;
+  if (version.major === 0 && version.minor === undefined && version.patch === undefined) return defaultPackageVersion;
   if (version.major === 0 && version.minor === 0 && version.patch === 0) return defaultPackageVersion;
 
-  let validatedVersion: string = defaultPackageVersion;
+  let validatedVersion: string = version.major.toString();
 
-  if (!Number.isNaN(version.major) && version.major >= 0) {
-    validatedVersion = version.major.toString();
-  }
+  if (version.minor === undefined) return validatedVersion;
 
-  if (!Number.isNaN(version.minor)) {
+  if (Number.isInteger(version.minor)) {
     validatedVersion += `.${version.minor.toString()}`;
   }
 
-  if (!Number.isNaN(version.patch)) {
+  if (version.patch === undefined) return validatedVersion;
+
+  if (Number.isInteger(version.patch)) {
     validatedVersion += `.${version.patch.toString()}`;
   }
 
-  // TODO: https://immutable.atlassian.net/browse/WT-1501
-  // Ensure this is gated by `version.prerelease !== undefined`
-  // once we go to prod with checkout.
-  validatedVersion += `-${version.prerelease}`;
+  if (version.prerelease === undefined || version.prerelease !== 'alpha') return validatedVersion;
+
+  if (version.prerelease === 'alpha') {
+    validatedVersion += `-${version.prerelease}`;
+  }
+
+  if (version.build === undefined) return validatedVersion;
 
-  if (version.build !== undefined && version.build > 0) {
-    validatedVersion += `.${version.build}`;
+  if (Number.isInteger(version.build) && version.build >= 0) {
+    validatedVersion += `.${version.build.toString()}`;
   }
 
   return validatedVersion;

packages/checkout/widgets/src/definitions/config.ts

@@ -17,9 +17,9 @@ import { WidgetTheme } from './types';
  */
 export type SemanticVersion = {
   major: number;
-  minor: number;
-  patch: number;
-  prerelease: 'alpha';
+  minor?: number;
+  patch?: number;
+  prerelease?: 'alpha';
   build?: number;
 };