diff --git a/lib/core/amount_converter.dart b/cw_core/lib/amount_converter.dart
similarity index 100%
rename from lib/core/amount_converter.dart
rename to cw_core/lib/amount_converter.dart
diff --git a/cw_haven/lib/pending_haven_transaction.dart b/cw_haven/lib/pending_haven_transaction.dart
index b362cdf34..1d95de08c 100644
--- a/cw_haven/lib/pending_haven_transaction.dart
+++ b/cw_haven/lib/pending_haven_transaction.dart
@@ -2,7 +2,7 @@ import 'package:cw_haven/api/structs/pending_transaction.dart';
 import 'package:cw_haven/api/transaction_history.dart'
     as haven_transaction_history;
 import 'package:cw_core/crypto_currency.dart';
-// import 'package:cake_wallet/core/amount_converter.dart';
+import 'package:cw_core/amount_converter.dart';
 import 'package:cw_core/pending_transaction.dart';
 
 class DoubleSpendException implements Exception {
@@ -25,17 +25,13 @@ class PendingHavenTransaction with PendingTransaction {
   @override
   String get hex => '';
 
-  // FIX-ME: AmountConverter
   @override
-  String get amountFormatted => '';
-    // AmountConverter.amountIntToString(
-    //   cryptoCurrency, pendingTransactionDescription.amount);
+  String get amountFormatted => AmountConverter.amountIntToString(
+      cryptoCurrency, pendingTransactionDescription.amount);
 
-  // FIX-ME: AmountConverter
   @override
-  String get feeFormatted => '';
-    // AmountConverter.amountIntToString(
-    //   cryptoCurrency, pendingTransactionDescription.fee);
+  String get feeFormatted => AmountConverter.amountIntToString(
+      cryptoCurrency, pendingTransactionDescription.fee);
 
   @override
   Future<void> commit() async {
diff --git a/cw_monero/lib/pending_monero_transaction.dart b/cw_monero/lib/pending_monero_transaction.dart
index 7488cfc08..2a75fc26b 100644
--- a/cw_monero/lib/pending_monero_transaction.dart
+++ b/cw_monero/lib/pending_monero_transaction.dart
@@ -2,7 +2,7 @@ import 'package:cw_monero/api/structs/pending_transaction.dart';
 import 'package:cw_monero/api/transaction_history.dart'
     as monero_transaction_history;
 import 'package:cw_core/crypto_currency.dart';
-// import 'package:cake_wallet/core/amount_converter.dart';
+import 'package:cw_core/amount_converter.dart';
 
 import 'package:cw_core/pending_transaction.dart';
 
@@ -27,17 +27,13 @@ class PendingMoneroTransaction with PendingTransaction {
 
   String get txKey => pendingTransactionDescription.txKey;
 
-  // FIX-ME: AmountConverter
   @override
-  String get amountFormatted => '';
-  //  AmountConverter.amountIntToString(
-  //     CryptoCurrency.xmr, pendingTransactionDescription.amount);
+  String get amountFormatted => AmountConverter.amountIntToString(
+      CryptoCurrency.xmr, pendingTransactionDescription.amount);
 
-  // FIX-ME: AmountConverter
   @override
-  String get feeFormatted => '';
-    //  AmountConverter.amountIntToString(
-    //   CryptoCurrency.xmr, pendingTransactionDescription.fee);
+  String get feeFormatted => AmountConverter.amountIntToString(
+      CryptoCurrency.xmr, pendingTransactionDescription.fee);
 
   @override
   Future<void> commit() async {
diff --git a/lib/exchange/morphtoken/morphtoken_exchange_provider.dart b/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
index c90b89391..1df4fef87 100644
--- a/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
+++ b/lib/exchange/morphtoken/morphtoken_exchange_provider.dart
@@ -1,5 +1,5 @@
 import 'dart:convert';
-import 'package:cake_wallet/core/amount_converter.dart';
+import 'package:cw_core/amount_converter.dart';
 import 'package:hive/hive.dart';
 import 'package:cake_wallet/exchange/trade_not_found_exeption.dart';
 import 'package:flutter/foundation.dart';