From ca5101816fc11ba5e29061f5a277f27b12f721d6 Mon Sep 17 00:00:00 2001
From: Julien Calixte <julienc@bam.tech>
Date: Sat, 7 Sep 2019 09:13:38 +0200
Subject: [PATCH 1/2] fix: trasaction creation

---
 src/services/TransactionService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/TransactionService.ts b/src/services/TransactionService.ts
index 246bc04..0408fd4 100644
--- a/src/services/TransactionService.ts
+++ b/src/services/TransactionService.ts
@@ -62,7 +62,7 @@ class TransactionService {
     transaction: ITransaction
   ): Promise<PouchDB.Core.Response> {
     try {
-      transaction._id = couchService.newId('tra', accountId)
+      transaction._id = couchService.newId(`tra-${accountId}`)
       transaction.doctype = 'transaction'
       transaction = await this.encrypt(transaction)
       return await couchService.save(transaction)

From d46fc9cc8c6f198f71847ab772f2d86b1025bff7 Mon Sep 17 00:00:00 2001
From: Julien Calixte <julienc@bam.tech>
Date: Sat, 7 Sep 2019 09:49:50 +0200
Subject: [PATCH 2/2] fix: remove encrypt method

---
 src/services/TransactionService.ts | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/services/TransactionService.ts b/src/services/TransactionService.ts
index 0408fd4..b8cca17 100644
--- a/src/services/TransactionService.ts
+++ b/src/services/TransactionService.ts
@@ -8,8 +8,6 @@ import IUser from '@/models/IUser'
 import IAccount from '@/models/IAccount'
 import IEncryptable from '@/models/IEncryptable'
 import IEncrypted from '@/models/IEncrypted'
-import { getCurrentPosition } from '@/utils'
-import mapService from './MapService'
 
 class TransactionService {
   public async getNew(
@@ -64,7 +62,6 @@ class TransactionService {
     try {
       transaction._id = couchService.newId(`tra-${accountId}`)
       transaction.doctype = 'transaction'
-      transaction = await this.encrypt(transaction)
       return await couchService.save(transaction)
     } catch (error) {
       // tslint:disable-next-line:no-console
@@ -155,20 +152,6 @@ class TransactionService {
     }
   }
 
-  private async encrypt(transaction: ITransaction): Promise<ITransaction> {
-    if (!transaction) {
-      return transaction
-    }
-    const encrypt = await couchService.encrypt(
-      transaction.accountId || '',
-      this.toEncrypt(transaction)
-    )
-    return {
-      ...transaction,
-      ...encrypt
-    }
-  }
-
   private async decrypt(transaction: ITransaction): Promise<ITransaction> {
     if (!transaction) {
       return transaction