@coinflowlabs/angular 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coinflowlabs/angular",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "scripts": {
     "clean": "rimraf ../../dist && rimraf ./src/lib/common",
     "build": "npm run codegen && ng build coinflowlabs",
@@ -14,7 +14,7 @@
     "bs58": "~5.0.0"
   },
   "dependencies": {
-    "tslib": "^2.3.0"
+    "tslib": "^2.6.2"
   },
   "peerDependenciesMeta": {
     "@coinflowlabs/lib-common": {

package/src/lib/common/CoinflowTypes.ts

@@ -1,5 +1,10 @@
-import type {Connection, VersionedTransaction} from '@solana/web3.js';
-import {PublicKey, Signer, Transaction} from '@solana/web3.js';
+import type {
+  Connection,
+  VersionedTransaction,
+  PublicKey,
+  Signer,
+  Transaction,
+} from '@solana/web3.js';
 
 export enum SettlementType {
   Credits = 'Credits',

package/src/lib/common/CoinflowUtils.ts

@@ -4,8 +4,8 @@ import {
   CoinflowIFrameProps,
   CoinflowPurchaseProps,
 } from './CoinflowTypes';
-import {Transaction, VersionedTransaction} from '@solana/web3.js';
-import base58 from 'bs58';
+import * as web3 from '@solana/web3.js';
+import * as base58 from 'bs58';
 
 export class CoinflowUtils {
   env: CoinflowEnvs;
@@ -218,9 +218,10 @@ export class CoinflowUtils {
   }
 
   static getTransaction(props: CoinflowPurchaseProps): string | undefined {
-    if ('transaction' in props) {
+    if ('transaction' in props && props.transaction !== undefined) {
       const {transaction} = props;
-      if (transaction instanceof Transaction) {
+      if (web3 && transaction instanceof web3.Transaction) {
+        if (!base58) throw new Error('bs58 dependency is required for Solana');
         return base58.encode(
           transaction.serialize({
             requireAllSignatures: false,
@@ -229,14 +230,15 @@ export class CoinflowUtils {
         );
       }
 
-      if (transaction instanceof VersionedTransaction) {
+      if (web3 && transaction instanceof web3.VersionedTransaction) {
+        if (!base58) throw new Error('bs58 dependency is required for Solana');
         return base58.encode(transaction.serialize());
       }
 
       return btoa(JSON.stringify(transaction));
     }
 
-    if ('action' in props) {
+    if ('action' in props && props.action !== undefined) {
       return btoa(JSON.stringify(props.action));
     }