updates to wallet functionality

src/main/java/zw/qantra/tm/domain/services/GroupBatchService.java

@@ -253,8 +253,10 @@ public class GroupBatchService {
             CompletableFuture<Object> future = workflowUtils
                     .waitForState(batch.getWorkflowId(), new String[]{"done", "failed"},
                             15000, 50);
-            future.get();
-            return getBatch(batchId, userId);
+            StateResponse response = (StateResponse) future.get();
+            String id = response.getBody().toString(); // this returns Batch Transaction ID
+            String cleaned = id.replaceAll("^\"|\"$", "");
+            return transactionService.findById(UUID.fromString(cleaned));
         } catch (InterruptedException | ExecutionException e) {
             throw new RuntimeException(e);
         }