@mojaloop/sdk-scheme-adapter 24.0.7-snapshot.4 → 24.0.7-snapshot.7

package/modules/api-svc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-api-svc",
-  "version": "21.0.0-snapshot.8",
+  "version": "21.0.0-snapshot.17",
   "description": "An adapter for connecting to Mojaloop API enabled switches.",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/modules/api-svc/src/lib/dto.js

@@ -27,7 +27,7 @@
 /*eslint quote-props: ["error", "as-needed"]*/
 const config = require('../config');
 const randomUUID = require('@mojaloop/central-services-shared').Util.id(config.idGenerator);
-const { Directions, SDKStateEnum} = require('./model/common');
+const { Directions, SDKStateEnum, AmountTypes } = require('./model/common');
 
 const quoteRequestStateDto = (request) => ({
     // transferId: this follows the slightly dodgy assumption that transferId will be same as this transactionId.
@@ -56,24 +56,41 @@ const fxQuoteRequestStateDto = (request) => ({
  * @param data {object} - "state" of inbound transaction request
  * Supports only single FXP and currency for now
  */
-const outboundPostFxQuotePayloadDto = (data) => Object.freeze({
-    conversionRequestId: randomUUID(),
-    conversionTerms: {
-        conversionId: randomUUID(), // should be the same as commitRequestId from fxTransfer
-        initiatingFsp: data.from.fspId,
-        determiningTransferId: data.transferId,
-        counterPartyFsp: data.fxProviders[0],
-        amountType: data.amountType,
-        sourceAmount: {
+const outboundPostFxQuotePayloadDto = (data) => {
+    let sourceAmount, targetAmount;
+    
+    sourceAmount = {
+        currency: data.currency,
+        amount: data.amount
+    };
+    targetAmount = {
+        currency: data.supportedCurrencies[0],
+    };
+
+    if (data.amountType === AmountTypes.RECEIVE && !config.supportedCurrencies.includes(data.currency)) {
+        sourceAmount = {
+            currency: config.supportedCurrencies[0],
+        };
+        targetAmount = {
             currency: data.currency,
             amount: data.amount
-        },
-        targetAmount: {
-            currency: data.supportedCurrencies[0],
-        },
-        expiration: data.fxQuoteExpiration,
+        };
     }
-});
+
+    return Object.freeze({
+        conversionRequestId: randomUUID(),
+        conversionTerms: {
+            conversionId: randomUUID(), // should be the same as commitRequestId from fxTransfer
+            initiatingFsp: data.from.fspId,
+            determiningTransferId: data.transferId,
+            counterPartyFsp: data.fxProviders[0],
+            amountType: data.amountType,
+            sourceAmount,
+            targetAmount,
+            expiration: data.fxQuoteExpiration,
+        }
+    });
+};
 
 /**
  * @param data {object} - "state" of inbound transaction request

package/modules/api-svc/src/lib/model/OutboundTransfersModel.js

@@ -398,8 +398,14 @@ class OutboundTransfersModel {
                             throw new Error(ErrorMessages.noSupportedCurrencies);
                         }
 
-                        this.data.supportedCurrencies = payee.supportedCurrencies;
                         this.data.needFx = this._isFxNeeded(this._supportedCurrencies, payee.supportedCurrencies, this.data.currency, this.data.amountType);
+                        this.data.supportedCurrencies = payee.supportedCurrencies;
+                        
+                        // if (this.data.amountType == AmountTypes.RECEIVE) {
+                        //     if ( !this._supportedCurrencies.includes(this.data.currency) ) {
+                        //         this.data.supportedCurrencies = this._supportedCurrencies;
+                        //     }
+                        // }
                     }
 
                     this._logger.isVerboseEnabled && this._logger.push({

package/modules/outbound-command-event-handler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-outbound-command-event-handler",
-  "version": "0.3.0-snapshot.7",
+  "version": "0.3.0-snapshot.16",
   "description": "Mojaloop sdk scheme adapter command event handler",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",

package/modules/outbound-domain-event-handler/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mojaloop/sdk-scheme-adapter-outbound-domain-event-handler",
-    "version": "0.3.0-snapshot.7",
+    "version": "0.3.0-snapshot.16",
     "description": "mojaloop sdk scheme adapter outbound domain event handler",
     "license": "Apache-2.0",
     "homepage": "https://github.com/mojaloop/sdk-scheme-adapter/",

package/modules/private-shared-lib/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.6",
+  "version": "0.4.0-snapshot.15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-      "version": "0.4.0-snapshot.6",
+      "version": "0.4.0-snapshot.15",
       "license": "Apache-2.0",
       "dependencies": {
         "@mojaloop/api-snippets": "17.7.9",

package/modules/private-shared-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter-private-shared-lib",
-  "version": "0.4.0-snapshot.7",
+  "version": "0.4.0-snapshot.16",
   "description": "SDK Scheme Adapter private shared library.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/accounts-and-balances-bc/tree/main/modules/private-types",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojaloop/sdk-scheme-adapter",
-  "version": "24.0.7-snapshot.4",
+  "version": "24.0.7-snapshot.7",
   "description": "mojaloop sdk-scheme-adapter",
   "license": "Apache-2.0",
   "homepage": "https://github.com/mojaloop/sdk-scheme-adapter",