Fix settlement finalize display order (#48)

* v2.1.1

* Remove ledger API

* Fix up helm chart

* Fix eslint config. Remove now-redundant ledger stuff.

* Fix progress indicator in settlement finalizing

* Reinstate ledger stuff that we were actually using.

helm/finance-portal-v2-ui/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "v2.3.0"
+appVersion: "v2.3.1"
 description: Mojaloop Finance Portal UI v2
 name: finance-portal-v2-ui
-version: 2.3.0
+version: 2.3.1

helm/finance-portal-v2-ui/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: ghcr.io/mojaloop/finance-portal-v2-ui
-  tag: v2.3.0
+  tag: v2.3.1
   pullPolicy: IfNotPresent
 
 imagePullCredentials:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "finance-portal-v2-ui",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "",
   "main": "index.js",
   "scripts": {

src/App/Settlements/SettlementFinalizingModal/index.tsx

@@ -60,8 +60,8 @@ const SettlementFinalizingModal: FC<ConnectorProps> = ({
 
   const orderedStates = [
     SettlementStatus.PendingSettlement,
-    SettlementStatus.PsTransfersReserved,
     SettlementStatus.PsTransfersRecorded,
+    SettlementStatus.PsTransfersReserved,
     SettlementStatus.PsTransfersCommitted,
     SettlementStatus.Settling,
     SettlementStatus.Settled,

src/App/Settlements/sagas.ts

@@ -87,7 +87,6 @@ function* finalizeSettlement(action: PayloadAction<Settlement>) {
           }),
         );
       }
-      // Note the deliberate fall-through behaviour here, representing the expected state transitions
       // eslint-ignore-next-line: no-fallthrough
       case SettlementStatus.PsTransfersRecorded: {
         yield put(
@@ -109,7 +108,6 @@ function* finalizeSettlement(action: PayloadAction<Settlement>) {
           }),
         );
       }
-      // Note the deliberate fall-through behaviour here, representing the expected state transitions
       // eslint-ignore-next-line: no-fallthrough
       case SettlementStatus.PsTransfersReserved: {
         yield put(
@@ -131,12 +129,10 @@ function* finalizeSettlement(action: PayloadAction<Settlement>) {
           }),
         );
       }
-      // Note the deliberate fall-through behaviour here, representing the expected state transitions
       // eslint-ignore-next-line: no-fallthrough
       case SettlementStatus.PsTransfersCommitted:
       // We could transition to PS_TRANSFERS_COMMITTED, but then we'd immediately transition to
       // SETTLING anyway, so we do nothing here.
-      // Note the deliberate fall-through behaviour here, representing the expected state transitions
       // eslint-ignore-next-line: no-fallthrough
       case SettlementStatus.Settling: {
         yield put(
@@ -183,7 +179,10 @@ function* finalizeSettlement(action: PayloadAction<Settlement>) {
         const accountSettlementResults: { status: number; data: any }[] = yield all(
           requests.map((r) => call(apis.settlementParticipantAccount.update, r.request)),
         );
-        const requestResultZip = accountSettlementResults.map((res, i) => ({ req: requests[i], res }));
+        const requestResultZip = accountSettlementResults.map((res, i) => ({
+          req: requests[i],
+          res,
+        }));
         const accountSettlementErrors = requestResultZip
           .filter(({ res }) => res.status !== 200)
           .map(({ req, res }) => {
@@ -210,7 +209,6 @@ function* finalizeSettlement(action: PayloadAction<Settlement>) {
           result = yield call(apis.settlement.read, { settlementId: action.payload.id });
         }
       }
-      // Note the deliberate fall-through behaviour here, representing the expected state transitions
       // eslint-ignore-next-line: no-fallthrough
       case SettlementStatus.Settled:
         yield put(