diff --git a/resources/assets/v1/mix-manifest.json b/resources/assets/v1/mix-manifest.json
index ff2938f703..145eaf58f2 100644
--- a/resources/assets/v1/mix-manifest.json
+++ b/resources/assets/v1/mix-manifest.json
@@ -20,8 +20,12 @@
     "/public/v1/js/app.js.LICENSE.txt": "/public/v1/js/app.js.LICENSE.txt",
     "/public/v1/js/app_vue.js": "/public/v1/js/app_vue.js",
     "/public/v1/js/app_vue.js.LICENSE.txt": "/public/v1/js/app_vue.js.LICENSE.txt",
+    "/public/v1/js/create.js": "/public/v1/js/create.js",
+    "/public/v1/js/create.js.LICENSE.txt": "/public/v1/js/create.js.LICENSE.txt",
     "/public/v1/js/create_transaction.js": "/public/v1/js/create_transaction.js",
     "/public/v1/js/create_transaction.js.LICENSE.txt": "/public/v1/js/create_transaction.js.LICENSE.txt",
+    "/public/v1/js/edit.js": "/public/v1/js/edit.js",
+    "/public/v1/js/edit.js.LICENSE.txt": "/public/v1/js/edit.js.LICENSE.txt",
     "/public/v1/js/edit_transaction.js": "/public/v1/js/edit_transaction.js",
     "/public/v1/js/edit_transaction.js.LICENSE.txt": "/public/v1/js/edit_transaction.js.LICENSE.txt",
     "/public/v1/js/exchange-rates/index.js": "/public/v1/js/exchange-rates/index.js",
@@ -96,6 +100,8 @@
     "/public/v1/js/ff/transactions/mass/edit-bulk.js": "/public/v1/js/ff/transactions/mass/edit-bulk.js",
     "/public/v1/js/ff/transactions/mass/edit.js": "/public/v1/js/ff/transactions/mass/edit.js",
     "/public/v1/js/ff/transactions/show.js": "/public/v1/js/ff/transactions/show.js",
+    "/public/v1/js/index.js": "/public/v1/js/index.js",
+    "/public/v1/js/index.js.LICENSE.txt": "/public/v1/js/index.js.LICENSE.txt",
     "/public/v1/js/lib/Chart.bundle.min.js": "/public/v1/js/lib/Chart.bundle.min.js",
     "/public/v1/js/lib/accounting.min.js": "/public/v1/js/lib/accounting.min.js",
     "/public/v1/js/lib/bootstrap-multiselect.js": "/public/v1/js/lib/bootstrap-multiselect.js",
@@ -120,6 +126,7 @@
     "/public/v1/js/lib/moment/en_US.js": "/public/v1/js/lib/moment/en_US.js",
     "/public/v1/js/lib/moment/es_ES.js": "/public/v1/js/lib/moment/es_ES.js",
     "/public/v1/js/lib/moment/es_MX.js": "/public/v1/js/lib/moment/es_MX.js",
+    "/public/v1/js/lib/moment/fa_IR.js": "/public/v1/js/lib/moment/fa_IR.js",
     "/public/v1/js/lib/moment/fi_FI.js": "/public/v1/js/lib/moment/fi_FI.js",
     "/public/v1/js/lib/moment/fr_FR.js": "/public/v1/js/lib/moment/fr_FR.js",
     "/public/v1/js/lib/moment/hu_HU.js": "/public/v1/js/lib/moment/hu_HU.js",
@@ -143,6 +150,7 @@
     "/public/v1/js/lib/moment/vi_VN.js": "/public/v1/js/lib/moment/vi_VN.js",
     "/public/v1/js/lib/moment/zh_CN.js": "/public/v1/js/lib/moment/zh_CN.js",
     "/public/v1/js/lib/moment/zh_TW.js": "/public/v1/js/lib/moment/zh_TW.js",
+    "/public/v1/js/lib/moment-tz.js": "/public/v1/js/lib/moment-tz.js",
     "/public/v1/js/lib/moment.min.js": "/public/v1/js/lib/moment.min.js",
     "/public/v1/js/lib/respond.min.js": "/public/v1/js/lib/respond.min.js",
     "/public/v1/js/lib/typeahead/bloodhound.js": "/public/v1/js/lib/typeahead/bloodhound.js",
@@ -154,6 +162,8 @@
     "/public/v1/js/lib/vue.js": "/public/v1/js/lib/vue.js",
     "/public/v1/js/profile.js": "/public/v1/js/profile.js",
     "/public/v1/js/profile.js.LICENSE.txt": "/public/v1/js/profile.js.LICENSE.txt",
+    "/public/v1/js/show.js": "/public/v1/js/show.js",
+    "/public/v1/js/show.js.LICENSE.txt": "/public/v1/js/show.js.LICENSE.txt",
     "/public/v1/js/webhooks/create.js": "/public/v1/js/webhooks/create.js",
     "/public/v1/js/webhooks/create.js.LICENSE.txt": "/public/v1/js/webhooks/create.js.LICENSE.txt",
     "/public/v1/js/webhooks/edit.js": "/public/v1/js/webhooks/edit.js",
diff --git a/resources/assets/v1/src/components/transactions/AccountSelect.vue b/resources/assets/v1/src/components/transactions/AccountSelect.vue
index 097a3bcf1b..4e3f3b1b1b 100644
--- a/resources/assets/v1/src/components/transactions/AccountSelect.vue
+++ b/resources/assets/v1/src/components/transactions/AccountSelect.vue
@@ -216,7 +216,7 @@ export default {
           }
         },
         selectedItem: function (e) {
-          console.log('In SelectedItem()');
+          // console.log('In SelectedItem()');
           if (typeof this.name === 'undefined') {
             // console.log('Is undefined');
             return;
diff --git a/resources/assets/v1/src/components/transactions/EditTransaction.vue b/resources/assets/v1/src/components/transactions/EditTransaction.vue
index 97fbf78f41..cdab12ba1f 100644
--- a/resources/assets/v1/src/components/transactions/EditTransaction.vue
+++ b/resources/assets/v1/src/components/transactions/EditTransaction.vue
@@ -540,12 +540,18 @@ export default {
                     allowed_types: window.expectedSourceTypes.destination[this.ucFirst(transaction.type)]
                 }
             };
+            // console.log('Destination currency id is ' + result.destination_account.currency_id);
             // if transaction type is transfer, the destination currency_id etc. MUST match the actual account currency info.
-            if ('transfer' === transaction.type && null !== transaction.foreign_currency_code) {
+            // OR if the transaction type is a withdrawal, and the destination account is a liability account, same as above.
+            if (
+                ('transfer' === transaction.type && null !== transaction.foreign_currency_code) ||
+                ('withdrawal' === transaction.type && ['Loan', 'Debt', 'Mortgage'].includes(transaction.destination_type) && null !== transaction.foreign_currency_code)
+            ) {
                 result.destination_account.currency_id = transaction.foreign_currency_id;
                 result.destination_account.currency_name = transaction.foreign_currency_name;
                 result.destination_account.currency_code = transaction.foreign_currency_code;
                 result.destination_account.currency_decimal_places = transaction.foreign_currency_decimal_places;
+                // console.log('Set destination currency_id to ' + result.destination_account.currency_id);
             }
 
 
diff --git a/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue b/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue
index a09016e23e..3f61bec9ed 100644
--- a/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue
+++ b/resources/assets/v1/src/components/transactions/ForeignAmountSelect.vue
@@ -137,7 +137,6 @@ export default {
                 // lock dropdown list on currencyID of destination.
                 for (const key in this.currencies) {
                     if (this.currencies.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
-
                         if (
                             parseInt(this.currencies[key].id) === parseInt(this.destination.currency_id)
                         ) {