From d4b1dcda896a2d98153387c7d0dafcf3cd38c662 Mon Sep 17 00:00:00 2001
From: Corrie Sloot <corrie@sloot.ca>
Date: Mon, 17 Oct 2022 17:03:11 -0400
Subject: [PATCH] rebase

---
 app/controllers/quote.controller.js  | 1 -
 app/controllers/upload.controller.js | 4 ++++
 app/models/quote.model.js            | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/controllers/quote.controller.js b/app/controllers/quote.controller.js
index 7d21390..240c929 100644
--- a/app/controllers/quote.controller.js
+++ b/app/controllers/quote.controller.js
@@ -621,7 +621,6 @@ exports.getLink = async (req, res) => {
 		});
 		return;
 	}
-
 	const tokenAmount = priceWei.add(priceWei.div(10)); // add 10% buffer since prices fluctuate
 >>>>>>> 03f4b2f (Partially Resolves #19)
 
diff --git a/app/controllers/upload.controller.js b/app/controllers/upload.controller.js
index def8b0b..b3544b9 100644
--- a/app/controllers/upload.controller.js
+++ b/app/controllers/upload.controller.js
@@ -184,6 +184,7 @@ exports.upload = async (req, res) => {
 		}
 >>>>>>> 03f4b2f (Partially Resolves #19)
 
+<<<<<<< HEAD
 	let oldNonce;
 	try {
 		oldNonce = Nonce.get(userAddress)?.nonce || 0.0;
@@ -210,6 +211,8 @@ exports.upload = async (req, res) => {
 		if(quote.status == Quote.QUOTE_STATUS_UPLOAD_END) {
 			errorResponse(req, res, null, 400, "Quote has been completed.");
 =======
+=======
+>>>>>>> 396a214 (rebase)
 		let priceWei;
 		try {
 			priceWei = await bundlr.getPrice(quote.size);
@@ -426,6 +429,7 @@ exports.upload = async (req, res) => {
 		// TODO: Unwrap WETH to ETH
 
 		// Fund our EOA's Bundlr Account
+
 		// TODO: Check the balance first
 >>>>>>> 03f4b2f (Partially Resolves #19)
 		try {
diff --git a/app/models/quote.model.js b/app/models/quote.model.js
index f5934d5..b94e6bf 100644
--- a/app/models/quote.model.js
+++ b/app/models/quote.model.js
@@ -141,8 +141,12 @@ Quote.getLink = (quoteId, result) => {
 			result(null, rows);
 		});
 	});
+<<<<<<< HEAD
 }
 
 >>>>>>> abbe0a9 (add getLink endpoint)
+=======
+};
+>>>>>>> 396a214 (rebase)
 
 module.exports = Quote;