Fixed Conflicts with master branch (#618)

* Validator Api calls made with js sdk, Fixed config types and test

* add memo

* memo to tables

* fixed all errors with updated sdk

* included comment for payment handler

* add memo (#615)

* add memo

* memo to tables

* IP update

Co-authored-by: Bucky <buckyroberts@gmail.com>

* 1.0.0-alpha.45

Co-authored-by: Justin Kim <justinkim943@gmail.com>
Co-authored-by: Bucky <buckyroberts@gmail.com>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "thenewboston",
   "productName": "TNB Account Manager",
-  "version": "1.0.0-alpha.44",
+  "version": "1.0.0-alpha.45",
   "description": "thenewboston Account Manager Electron Application",
   "main": "./bundle/main/index.js",
   "scripts": {

src/renderer/containers/Connect/index.tsx

@@ -16,7 +16,7 @@ import {displayErrorToast, displayToast} from '@renderer/utils/toast';
 import './Connect.scss';
 
 const initialValues = {
-  ipAddress: '143.110.137.54',
+  ipAddress: '54.177.121.3',
   nickname: '',
   port: '80',
   protocol: 'http' as ProtocolType,

src/renderer/utils/blocks.ts

@@ -18,6 +18,8 @@ export const fetchAccountBalanceLock = async (
   throw new Error('Error: fetchAccountBalanceLock');
 };
 
+export const sanitizeMemo = (memo: string): string => memo.trim();
+
 export const sendBlock = async (
   activeBankConfig: BankConfig,
   senderSigningKey: string,