Resolve merge conflicts

ecom-service/src/main/resources/application.properties

@@ -12,6 +12,12 @@ server.port=8080
 #promos.apiUrl=http://40.118.215.99:8082
 #orders.apiUrl=http://138.91.251.222:8086
 
+# UNCOMMENT FOR PRODUCTION DEPLOYMENT
+#products.apiUrl=http://13.64.175.185:8080
+#promos.apiUrl=http://40.118.215.99:8082
+#orders.apiUrl=http://138.91.251.222:8086
+
+# UNCOMMENT FOR LOCAL TESTING
 products.apiUrl=http://localhost:8083
 promos.apiUrl=http://localhost:8082
 orders.apiUrl=http://localhost:8084

ecom-web/src/components/order-history/order-history.jsx

@@ -29,7 +29,7 @@ const OrderHistory = () => {
                 <div>Please login to place orders!</div>
             ) : null}
             <div id="orders">
-                {orderHistory.map((order, ind) => {
+                {orderHistory.reverse().map((order, ind) => {
                     return <Order order={order} key={ind} alt={ind}/>;
                 })}
             </div>