chore: add CONTRIBUTING file

2023-04-27 01:50:09 +02:00
679 changed files with 12256 additions and 6909 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1,53 +0,0 @@
-{
-  "files": [
-    "README.md"
-  ],
-  "imageSize": 100,
-  "commit": false,
-  "commitType": "docs",
-  "commitConvention": "angular",
-  "contributors": [
-    {
-      "login": "abouolia",
-      "name": "Ahmed Bouhuolia",
-      "avatar_url": "https://avatars.githubusercontent.com/u/2197422?v=4",
-      "profile": "https://github.com/abouolia",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "ameir",
-      "name": "Ameir Abdeldayem",
-      "avatar_url": "https://avatars.githubusercontent.com/u/374330?v=4",
-      "profile": "http://ameir.net",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "elforjani13",
-      "name": "ElforJani13",
-      "avatar_url": "https://avatars.githubusercontent.com/u/39470382?v=4",
-      "profile": "https://github.com/elforjani13",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "scheibling",
-      "name": "Lars Scheibling",
-      "avatar_url": "https://avatars.githubusercontent.com/u/24367830?v=4",
-      "profile": "https://scheibling.se",
-      "contributions": [
-        "bug"
-      ]
-    }
-  ],
-  "contributorsPerLine": 7,
-  "skipCi": true,
-  "repoType": "github",
-  "repoHost": "https://github.com",
-  "projectName": "bigcapital",
-  "projectOwner": "bigcapitalhq"
-}
--- a/.env.example
+++ b/.env.example
@@ -8,42 +8,27 @@ MAIL_FROM_NAME=
 MAIL_FROM_ADDRESS=

 # Database
-DB_HOST=mysql
-DB_USER=bigcapital
-DB_PASSWORD=bigcapital
-DB_ROOT_PASSWORD=root
-DB_CHARSET=utf8
+DB_USER=
+DB_HOST=
+DB_PASSWORD=
+DB_CHARSET=

 # System database
 SYSTEM_DB_NAME=bigcapital_system
-# SYSTEM_DB_USER=
-# SYSTEM_DB_PASSWORD=
-# SYSTEM_DB_NAME=
-# SYSTEM_DB_CHARSET=

-# Tenant databases
+# Tenants databases
 TENANT_DB_NAME_PERFIX=bigcapital_tenant_
-# TENANT_DB_HOST=
-# TENANT_DB_USER=
-# TENANT_DB_PASSWORD=
-# TENANT_DB_CHARSET=

-# Application
-BASE_URL=http://example.com
-JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
-
-# Jobs MongoDB
+# MongoDB
 MONGODB_DATABASE_URL=mongodb://localhost/bigcapital

-# App proxy
-PUBLIC_PROXY_PORT=80
-PUBLIC_PROXY_SSL_PORT=443
+# Authentication
+JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
+
+# Application
+BASE_URL=https://bigcapital.ly
+CONTACT_US_MAIL=support@bigcapital.ly

 # Agendash
 AGENDASH_AUTH_USER=agendash
 AGENDASH_AUTH_PASSWORD=123123
-
-# Sign-up restrictions
-SIGNUP_DISABLED=false
-SIGNUP_ALLOWED_DOMAINS=
-SIGNUP_ALLOWED_EMAILS=
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-docker/nginx/scripts/build-nginx.sh text eol=lf
-docker/mariadb/docker-entrypoint.sh text eol=lf
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,100 +2,6 @@

 All notable changes to Bigcapital server-side will be in this file.

-# [0.9.9] - 28-06-2023
-
-* refactor: Customer and vendor select component by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/171
-* chore: Move auto-increment components in separate files by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/170
-* fix: Style of quick item drawer by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/173
-* fix: Should not show the form before loading account by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/172
-* fix: Payment made form does not handle not unique number an e… by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/177
-* fix: Internal note of invoice/bill payment does not saving by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/181
-* fix: Storing cash flow transaction description by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/180
-* fix: No currency in amount field on money in/out dialogs by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/179
-* fix: No default branch for customer/vendor opening balance branch by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/182
-
-# [0.9.8] - 19-06-2023
-
-`bigcapitalhq/webapp`
-
-* add: Inventory Adjustment option to the item drawer by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/158
-* fix: use all drawers names from common enum object by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/157
-* fix: adjustment type options do not show up by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/159
-* fix: change the remove line text to be red to intent as a danger action by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/162
-* fix: rename sidebar localization keys names to be keyword path by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/161
-* fix: manual journal placeholder text by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/160
-* fix: warehouses select component by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/168
-
-`bigcapitalhq/server`
-
-* fix: sending emails on reset password and registration by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/167
-
-## [0.9.7] - 14-06-2023
-
-`@bigcapital/webapp`
-* fix: change the footer links of onboarding pages by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/139
-
-`@bigcapital/server`
-* fix: expense transaction journal entries by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/155
-
-## [0.9.6] - 12-06-2023
-
-`@bigcapital/webapp`
-
-* fix: remove duplicated form submitting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/138
-* feat: add monorepo version on the application sidebar by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/136
-
-## [0.9.5] - 11-06-2023
-
-`@bigcapital/server`
-
-* fix: filter ledger entries that effect contact balance to AR/AP accounts only by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/132
-
-`@bigcapital/webapp`
-
-* fix: catch journal error when create a journal with accounts have different currency by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/135
-* fix: add duplicate icon to context menu of customers and vendors table by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/133
-* fix: customer/vendor opening balance with exchange rate by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/134
-
-## [0.9.4] - 08-06-2023
-
-`@bigcapital/monorepo`
- fixed: docker-compose line-ending issue on Windows by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/130
-
-`@bigcapital/server`
- fixed: Disable Webpack minification for JS class name reading.
-
-## [0.9.3] -04-06-2023
-
-`@bigcapital/monorepo`
-* Added: Add env variable to customize the proxy public ports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/125
-* Added: Migrate the server database to MariaDB by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/128
-
-## [0.9.2] - 31-05-2023
-
-`@bigcapital/webapp`
-
- fixed: move `packaeg-lock.json` inside docker container.
- fixed: remove Sentry from the web client.
-
-## [0.9.1] - 28-05-2023
-
-`@bigcapital/server`
- fix: deleting ledger entries of manual journal.
- fix: base currency should be enabled.
- fix: delete invoice transaction issue.
-
-`@bigcapital/webapp`
- fix: general, accoutant and items preferences.
- fix: auto-increment sale invoices, estiamtes, credit notes, payments and manual journals.
- refactor: the setup organization form to use binded Formik components.
-
-## [0.9.0] - 06-05-2023
-
-`@bigcapital/server`
-
- [Sign-up restrictions](https://docs.bigcapital.ly/docs/deployment/signup_restriction) for self-hosting instances to disable signup or control the allowed email addresses and domains that can sign-up.
-
 ## [0.8.3] - 06-04-2023

 `@bigcaptial/monorepo`
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,7 +34,7 @@ Contributions via pull requests are much appreciated. Once the approach is agree
 ## Contribute to Backend

 - Clone the `bigcapital` repository and `cd` into `bigcapital` directory.
- Install all npm dependencies of the monorepo, you don't have to change directory to the `backend` package. just hit these command on root directory and it will install dependencies of all packages.
+- Install all npm dependencies of the monorepo, you don't have to change directory to the `backend` package. just hit the command on root directory and it will install dependencies of all packages.

 ```
 npm install
@@ -47,7 +47,7 @@ npm run bootstrap
 docker-compose up -d
 ```

-Wait some seconds, and hit `docker-compose ps` and you should see the same result below.
+Wait some seconds, and hit `docker-compose ps` to see the result and you should see the same result below.

 ```
 CONTAINER ID   IMAGE              COMMAND                  CREATED         STATUS        PORTS                               NAMES
@@ -122,7 +122,7 @@ There are many other ways to get involved with the community and to participate
 - Use the product, submitting GitHub issues when a problem is found.
 - Help code review pull requests and participate in issue threads.
 - Submit a new feature request as an issue.
- Help answer questions on forums such as Bigcapital Community Discord Channel.
+- Help answer questions on forums such as Stack Overflow and SigNoz Community Slack Channel.
 - Tell others about the project on Twitter, your blog, etc.

 **[`^top^`](#)**
--- a/README.md
+++ b/README.md
@@ -7,24 +7,6 @@
  <p align="center">
    Simple, smart online accounting software for small and medium businesses.
  </p>
-
-  <p align="center">
-    <a href="https://github.com/bigcapitalhq/bigcapital/commits/develop">
-      <img src="https://img.shields.io/github/commit-activity/m/bigcapitalhq/bigcapital/develop" />
-    </a>
-    <a href="https://discord.com/invite/c8nPBJafeb">
-      <img src="https://img.shields.io/discord/1066514716752625725?label=Discord" alt="" />
-    </a>
-    <a href="https://github.com/bigcapitalhq/bigcapital/graphs/contributors">
-      <img src="https://img.shields.io/github/contributors/bigcapitalhq/bigcapital" alt="" />
-    </a>
-    <a href="https://github.com/bigcapitalhq/bigcapital/blob/develop/LICENSE">
-      <img src="https://img.shields.io/github/license/bigcapitalhq/bigcapital" alt="" />
-    </a>
-    <a href="https://twitter.com/bigcapitalhq"> 
-      <img src="https://img.shields.io/twitter/follow/bigcapitalhq?style=social" alt="twitter" />
-    </a>
-  </p>
 </p>

 # What's Bigcapital?
@@ -40,45 +22,10 @@ Bigcapital is a smart and open-source accounting and inventory software, Bigcapi
 # Resources

 - [Documentation](https://docs.bigcapital.ly/) - Learn how to use.
- [Contribution](https://github.com/bigcapitalhq/bigcapital/blob/develop/CONTRIBUTING.md) - Welcome to any contributions.
 - [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help.
 - [Bug Tracker](https://github.com/bigcapitalhq/bigcapital/issues) - Notify us new bugs.
+- [Source Code](https://github.com/bigcapitalhq/bigcapital) - Github repo.

-# Changelog
+# Changlog

 Please see [Releases](https://github.com/bigcapitalhq/bigcapital/releases) for more information what has changed recently.
-
-# Recognition
-
-<a href="https://news.ycombinator.com/item?id=36118990">
-  <img
-    style="width: 250px; height: 54px;" width="250" height="54"
-    alt="Featured on Hacker News"
-    src="https://hackernews-badge.vercel.app/api?id=36118990"
-  />
-</a>
-
-# Contributors
-
-Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
-
-<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-<!-- prettier-ignore-start -->
-<!-- markdownlint-disable -->
-<table>
-  <tbody>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/abouolia"><img src="https://avatars.githubusercontent.com/u/2197422?v=4?s=100" width="100px;" alt="Ahmed Bouhuolia"/><br /><sub><b>Ahmed Bouhuolia</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=abouolia" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/elforjani13"><img src="https://avatars.githubusercontent.com/u/39470382?v=4?s=100" width="100px;" alt="ElforJani13"/><br /><sub><b>ElforJani13</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=elforjani13" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://ameir.net"><img src="https://avatars.githubusercontent.com/u/374330?v=4?s=100" width="100px;" alt="Ameir Abdeldayem"/><br /><sub><b>Ameir Abdeldayem</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aameir" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://scheibling.se"><img src="https://avatars.githubusercontent.com/u/24367830?v=4?s=100" width="100px;" alt="Lars Scheibling"/><br /><sub><b>Lars Scheibling</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Ascheibling" title="Bug reports">🐛</a></td>
-    </tr>
-  </tbody>
-</table>
-
-<!-- markdownlint-restore -->
-<!-- prettier-ignore-end -->
-
-<!-- ALL-CONTRIBUTORS-LIST:END -->
-
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -15,14 +15,14 @@ services:
      - ./data/logs/nginx/:/var/log/nginx
      - ./docker/certbot/certs/:/var/certs
    ports:
-      - "${PUBLIC_PROXY_PORT:-80}:80"
-      - "${PUBLIC_PROXY_SSL_PORT:-443}:443"
+      - "80:80"
+      - "443:443"
    tty: true
    depends_on:
      - server
      - webapp

-  webapp:
+  webapp: 
    container_name: bigcapital-webapp
    image: ghcr.io/bigcapitalhq/webapp:latest

@@ -72,11 +72,6 @@ services:
      - AGENDASH_AUTH_USER=${AGENDASH_AUTH_USER}
      - AGENDASH_AUTH_PASSWORD=${AGENDASH_AUTH_PASSWORD}

-      # Sign-up restrictions
-      - SIGNUP_DISABLED=${SIGNUP_DISABLED}
-      - SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
-      - SIGNUP_ALLOWED_EMAILS=${SIGNUP_ALLOWED_EMAILS}
-
  database_migration:
    container_name: bigcapital-database-migration
    build:
@@ -94,12 +89,12 @@ services:
  mysql:
    container_name: bigcapital-mysql
    build:
-      context: ./docker/mariadb
+      context: ./docker/mysql
    environment:
      - MYSQL_DATABASE=${SYSTEM_DB_NAME}
      - MYSQL_USER=${DB_USER}
      - MYSQL_PASSWORD=${DB_PASSWORD}
-      - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
    volumes:
      - mysql:/var/lib/mysql
    expose:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,14 +6,14 @@
 version: '3.3'

 services:
-  mariadb:
+  mysql:
    build:
-      context: ./docker/mariadb
+      context: ./docker/mysql
    environment:
      - MYSQL_DATABASE=${SYSTEM_DB_NAME}
      - MYSQL_USER=${DB_USER}
      - MYSQL_PASSWORD=${DB_PASSWORD}
-      - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
    volumes:
      - mysql:/var/lib/mysql
    expose:
--- a/docker/mariadb/Dockerfile
+++ b/docker/mariadb/Dockerfile
@@ -1,4 +1,4 @@
-FROM mariadb:10.2
+FROM mysql:5.7

 USER root
 ADD my.cnf /etc/mysql/conf.d/my.cnf
@@ -17,7 +17,7 @@ ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
 COPY ./init.sql /scripts/init.template.sql
 COPY ./docker-entrypoint.sh /docker-entrypoint-initdb.d/docker-initialize.sh

-# The scripts in the `docker-entrypoint-initdb.d/` directory are executed as
+# The scripts in the docker-entrypoint-initdb.d/ directory are executed as
 # the mysql user inside the MySQL Docker container.
 RUN chown -R mysql:root /docker-entrypoint-initdb.d
 RUN chown -R mysql:root /scripts
--- a/docker/mariadb/docker-entrypoint.sh
+++ b/docker/mariadb/docker-entrypoint.sh
--- a/docker/mariadb/init.sql
+++ b/docker/mariadb/init.sql
@@ -1,3 +1,2 @@
 GRANT ALL PRIVILEGES ON *.* TO '{MYSQL_USER}'@'%' IDENTIFIED BY '{MYSQL_PASSWORD}' WITH GRANT OPTION;
-
 FLUSH PRIVILEGES;
--- a/docker/mariadb/my.cnf
+++ b/docker/mariadb/my.cnf
--- a/e2e/_utils.ts
+++ b/e2e/_utils.ts
@@ -1,13 +0,0 @@
-import { Page } from '@playwright/test';
-
-export const clearLocalStorage = (page: Page) => {
-  return page.evaluate(`window.localStorage.clear()`);
-};
-
-export const defaultPageConfig = () => {
-  return {
-    extraHTTPHeaders: {
-      'ngrok-skip-browser-warning': 'any-value',
-    },
-  };
-};
--- a/e2e/authentication.spec.ts
+++ b/e2e/authentication.spec.ts
@@ -1,23 +1,14 @@
 import { test, expect, Page } from '@playwright/test';
-import { faker } from '@faker-js/faker';
-import { clearLocalStorage, defaultPageConfig } from './_utils';

 let authPage: Page;

 test.describe('authentication', () => {
  test.beforeAll(async ({ browser }) => {
-    authPage = await browser.newPage({ ...defaultPageConfig() });
-  });
-  test.afterAll(async () => {
-    await authPage.close();
-  });
-  test.afterEach(async ({ context }) => {
-    context.clearCookies();
-    await clearLocalStorage(authPage);
+    authPage = await browser.newPage();
  });

  test.describe('login', () => {
-    test.beforeEach(async () => {
+    test.beforeAll(async () => {
      await authPage.goto('/auth/login');
    });
    test('should show the login page.', async () => {
@@ -39,23 +30,10 @@ test.describe('authentication', () => {
      await authPage.getByRole('link', { name: 'Sign up' }).click();
      await expect(authPage.url()).toContain('/auth/register');
    });
-    test('should the email or password is not correct.', async () => {
-      await authPage.getByLabel('Email Address').click();
-      await authPage.getByLabel('Email Address').fill(faker.internet.email());
-
-      await authPage.getByLabel('Password').click();
-      await authPage.getByLabel('Password').fill(faker.internet.password());
-
-      await authPage.getByRole('button', { name: 'Log in' }).click();
-
-      await expect(authPage.locator('body')).toContainText(
-        'The email and password you entered did not match our records.'
-      );
-    });
  });

  test.describe('register', () => {
-    test.beforeEach(async () => {
+    test.beforeAll(async () => {
      await authPage.goto('/auth/register');
    });
    test('should first name, last name, email and password be required.', async () => {
@@ -74,36 +52,10 @@ test.describe('authentication', () => {
        'Password is a required field'
      );
    });
-    test('should signup successfully.', async () => {
-      const form = authPage.locator('form');
-      await form.getByLabel('First Name').click();
-      await form.getByLabel('First Name').fill(faker.person.firstName());
-
-      await form.getByLabel('Email').click();
-      await form.getByLabel('Email').fill(faker.internet.email());
-
-      await form.getByLabel('Last Name').click();
-      await form.getByLabel('Last Name').fill(faker.person.lastName());
-
-      await form.getByLabel('Password').click();
-      await form.getByLabel('Password').fill(faker.internet.password());
-
-      await authPage.getByRole('button', { name: 'Register' }).click();
-
-      await expect(authPage.locator('h1')).toContainText(
-        'Register a New Organization now!'
-      );
-    });
  });

  test.describe('reset password', () => {
-    test.beforeAll(async ({ browser }) => {
-      authPage = await browser.newPage({ ...defaultPageConfig() });
-    });
-    test.afterAll(async () => {
-      await authPage.close();
-    });
-    test.beforeEach(async () => {
+    test.beforeAll(async () => {
      await authPage.goto('/auth/send_reset_password');
    });
    test('should email be required.', async () => {
--- a/e2e/onboarding.spec.ts
+++ b/e2e/onboarding.spec.ts
@@ -1,86 +0,0 @@
-import { test, expect, Page } from '@playwright/test';
-import { faker } from '@faker-js/faker';
-import { defaultPageConfig } from './_utils';
-
-let authPage: Page;
-let businessLegalName: string = faker.company.name();
-
-test.describe('onboarding', () => {
-  test.beforeAll(async ({ browser }) => {
-    authPage = await browser.newPage({ ...defaultPageConfig() });
-    await authPage.goto('/auth/register');
-
-    const form = authPage.locator('form');
-
-    await form.getByLabel('First Name').fill(faker.person.firstName());
-    await form.getByLabel('Email').fill(faker.internet.email());
-    await form.getByLabel('Last Name').fill(faker.person.lastName());
-    await form.getByLabel('Password').fill(faker.internet.password());
-
-    await authPage.getByRole('button', { name: 'Register' }).click();
-  });
-  test('should validation catch all required fields', async () => {
-    const form = authPage.locator('form');
-
-    await authPage.getByRole('button', { name: 'Save & Continue' }).click();
-
-    await expect(form).toContainText('Organization name is a required field');
-    await expect(form).toContainText('Location is a required field');
-    await expect(form).toContainText('Base currency is a required field');
-    await expect(form).toContainText('Fiscal year is a required field');
-    await expect(form).toContainText('Time zone is a required field');
-  });
-  test.describe('after onboarding', () => {
-    test.beforeAll(async () => {
-      await authPage.getByLabel('Legal Organization Name').click();
-      await authPage
-        .getByLabel('Legal Organization Name')
-        .fill(businessLegalName);
-
-      // Fill Business Location.
-      await authPage
-        .getByRole('button', { name: 'Select Business Location...' })
-        .click();
-      await authPage.locator('a').filter({ hasText: 'Albania' }).click();
-
-      // Fill Base Currency.
-      await authPage
-        .getByRole('button', { name: 'Select Base Currency...' })
-        .click();
-      await authPage
-        .locator('a')
-        .filter({ hasText: 'AED - United Arab Emirates Dirham' })
-        .click();
-
-      // Fill Fasical Year.
-      await authPage
-        .getByRole('button', { name: 'Select Fiscal Year...' })
-        .click();
-      await authPage.locator('a').filter({ hasText: 'June - May' }).click();
-
-      // Fill Timezone.
-      await authPage
-        .getByRole('button', { name: 'Select Time Zone...' })
-        .click();
-      await authPage.getByText('Pacific/Marquesas-09:30').click();
-
-      // Click on Submit button
-      await authPage.getByRole('button', { name: 'Save & Continue' }).click();
-    });
-    test('should onboarding process success', async () => {
-      await expect(authPage.locator('body')).toContainText(
-        'Congrats! You are ready to go',
-        {
-          timeout: 30000,
-        }
-      );
-    });
-    test('should go to the dashboard after clicking on "Go to dashboard" button.', async () => {
-      await authPage.getByRole('button', { name: 'Go to dashboard' }).click();
-
-      await expect(
-        authPage.locator('[data-testId="dashboard-topbar"] h1')
-      ).toContainText(businessLegalName);
-    });
-  });
-});
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
  "useWorkspaces": true,
-  "version": "0.9.6",
+  "version": "0.0.0",
  "npmClient": "npm"
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -333,12 +333,6 @@
        "@jridgewell/trace-mapping": "0.3.9"
      }
    },
-    "@faker-js/faker": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-8.0.2.tgz",
-      "integrity": "sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==",
-      "dev": true
-    },
    "@gar/promisify": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
@@ -951,7 +945,6 @@
      "version": "1.32.3",
      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz",
      "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==",
-      "dev": true,
      "requires": {
        "@types/node": "*",
        "fsevents": "2.3.2",
@@ -961,8 +954,7 @@
        "playwright-core": {
          "version": "1.32.3",
          "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz",
-          "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg==",
-          "dev": true
+          "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg=="
        }
      }
    },
@@ -1011,8 +1003,7 @@
    "@types/node": {
      "version": "18.14.6",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz",
-      "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==",
-      "dev": true
+      "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="
    },
    "@types/normalize-package-data": {
      "version": "2.4.1",
@@ -2333,7 +2324,6 @@
      "version": "2.3.2",
      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
      "optional": true
    },
    "function-bind": {
--- a/package.json
+++ b/package.json
@@ -18,13 +18,12 @@
    "shared/*"
  ],
  "devDependencies": {
-    "@commitlint/cli": "^17.4.2",
    "@commitlint/config-conventional": "^17.4.2",
    "@commitlint/config-lerna-scopes": "^17.4.2",
-    "@faker-js/faker": "^8.0.2",
-    "@playwright/test": "^1.32.3",
    "husky": "^8.0.3",
-    "lerna": "^6.4.1"
+    "lerna": "^6.4.1",
+    "@commitlint/cli": "^17.4.2",
+    "@playwright/test": "^1.32.3"
  },
  "engines": {
    "node": "14.x"
--- a/packages/server/Dockerfile
+++ b/packages/server/Dockerfile
@@ -34,11 +34,7 @@ ARG MAIL_HOST= \
  BASE_URL= \
  # Agendash
  AGENDASH_AUTH_USER=agendash \
-  AGENDASH_AUTH_PASSWORD=123123 \
-  # Sign-up restriction
-  SIGNUP_DISABLED= \
-  SIGNUP_ALLOWED_DOMAINS= \
-  SIGNUP_ALLOWED_EMAILS=
+  AGENDASH_AUTH_PASSWORD=123123 

 ENV MAIL_HOST=$MAIL_HOST \
  MAIL_USERNAME=$MAIL_USERNAME \
@@ -72,11 +68,7 @@ ENV MAIL_HOST=$MAIL_HOST \
  # MongoDB
  MONGODB_DATABASE_URL=$MONGODB_DATABASE_URL \
  # Application
-  BASE_URL=$BASE_URL \
-  # Sign-up restriction
-  SIGNUP_DISABLED=$SIGNUP_DISABLED \
-  SIGNUP_ALLOWED_DOMAINS=$SIGNUP_ALLOWED_DOMAINS \
-  SIGNUP_ALLOWED_EMAILS=$SIGNUP_ALLOWED_EMAILS
+  BASE_URL=$BASE_URL

 # Create app directory.
 WORKDIR /app
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@bigcapital/server",
-  "version": "0.9.5",
+  "version": "1.7.1",
  "description": "",
  "main": "src/server.ts",
  "scripts": {
--- a/packages/server/scripts/webpack.common.js
+++ b/packages/server/scripts/webpack.common.js
@@ -65,9 +65,6 @@ exports.getCommonWebpackOptions = ({
        },
      ],
    },
-    optimization: {
-      minimize: false,
-    },
  };

  if (isDev) {
--- a/packages/server/src/api/controllers/Accounts.ts
+++ b/packages/server/src/api/controllers/Accounts.ts
@@ -3,12 +3,7 @@ import { check, param, query } from 'express-validator';
 import { Service, Inject } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseController from '@/api/controllers/BaseController';
-import {
-  AbilitySubject,
-  AccountAction,
-  IAccountDTO,
-  IAccountsStructureType,
-} from '@/interfaces';
+import { AbilitySubject, AccountAction, IAccountDTO } from '@/interfaces';
 import { ServiceError } from '@/exceptions';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import { DATATYPES_LENGTH } from '@/data/DataTypes';
@@ -177,11 +172,6 @@ export default class AccountsController extends BaseController {

      query('inactive_mode').optional().isBoolean().toBoolean(),
      query('search_keyword').optional({ nullable: true }).isString().trim(),
-
-      query('structure')
-        .optional()
-        .isString()
-        .isIn([IAccountsStructureType.Tree, IAccountsStructureType.Flat]),
    ];
  }

@@ -351,7 +341,6 @@ export default class AccountsController extends BaseController {
      sortOrder: 'desc',
      columnSortBy: 'created_at',
      inactiveMode: false,
-      structure: IAccountsStructureType.Tree,
      ...this.matchedQueryData(req),
    };

--- a/packages/server/src/api/controllers/Authentication.ts
+++ b/packages/server/src/api/controllers/Authentication.ts
@@ -49,7 +49,6 @@ export default class AuthenticationController extends BaseController {
      asyncMiddleware(this.resetPassword.bind(this)),
      this.handlerErrors
    );
-    router.get('/meta', asyncMiddleware(this.getAuthMeta.bind(this)));
    return router;
  }

@@ -92,7 +91,6 @@ export default class AuthenticationController extends BaseController {
      check('password')
        .exists()
        .isString()
-        .isLength({ min: 6 })
        .trim()
        .escape()
        .isLength({ max: DATATYPES_LENGTH.STRING }),
@@ -107,7 +105,7 @@ export default class AuthenticationController extends BaseController {
    return [
      check('password')
        .exists()
-        .isLength({ min: 6 })
+        .isLength({ min: 5 })
        .custom((value, { req }) => {
          if (value !== req.body.confirm_password) {
            throw new Error("Passwords don't match");
@@ -209,23 +207,6 @@ export default class AuthenticationController extends BaseController {
    }
  }

-  /**
-   * Retrieves the authentication meta for SPA.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {Function} next
-   * @returns {Response|void}
-   */
-  private async getAuthMeta(req: Request, res: Response, next: Function) {
-    try {
-      const meta = await this.authApplication.getAuthMeta();
-
-      return res.status(200).send({ meta });
-    } catch (error) {
-      next(error);
-    }
-  }
-
  /**
   * Handles the service errors.
   */
@@ -266,30 +247,6 @@ export default class AuthenticationController extends BaseController {
          errors: [{ type: 'EMAIL.EXISTS', code: 600 }],
        });
      }
-      if (error.errorType === 'SIGNUP_RESTRICTED') {
-        return res.status(400).send({
-          errors: [
-            {
-              type: 'SIGNUP_RESTRICTED',
-              message:
-                'Sign-up is restricted no one can sign-up to the system.',
-              code: 700,
-            },
-          ],
-        });
-      }
-      if (error.errorType === 'SIGNUP_RESTRICTED_NOT_ALLOWED') {
-        return res.status(400).send({
-          errors: [
-            {
-              type: 'SIGNUP_RESTRICTED_NOT_ALLOWED',
-              message:
-                'Sign-up is restricted the given email address is not allowed to sign-up.',
-              code: 710,
-            },
-          ],
-        });
-      }
    }
    next(error);
  }
--- a/packages/server/src/api/controllers/FinancialStatements/BalanceSheet.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/BalanceSheet.ts
@@ -41,7 +41,7 @@ export default class BalanceSheetStatementController extends BaseFinancialReport
  get balanceSheetValidationSchema(): ValidationChain[] {
    return [
      ...this.sheetNumberFormatValidationSchema,
-      query('accounting_method').optional().isIn(['cash', 'accrual']),
+      query('accounting_method').optional().isIn(['cash', 'accural']),

      query('from_date').optional(),
      query('to_date').optional(),
--- a/packages/server/src/api/controllers/FinancialStatements/GeneralLedger.ts
+++ b/packages/server/src/api/controllers/FinancialStatements/GeneralLedger.ts
@@ -67,7 +67,6 @@ export default class GeneralLedgerReportController extends BaseFinancialReportCo
    try {
      const { data, query, meta } =
        await this.generalLedgetService.generalLedger(tenantId, filter);
-
      return res.status(200).send({
        meta: this.transfromToResponse(meta),
        data: this.transfromToResponse(data),
--- a/packages/server/src/api/controllers/Organization.ts
+++ b/packages/server/src/api/controllers/Organization.ts
@@ -58,7 +58,7 @@ export default class OrganizationController extends BaseController {
  private get organizationValidationSchema(): ValidationChain[] {
    return [
      check('name').exists().trim(),
-      check('industry').optional({ nullable: true }).isString().trim().escape(),
+      check('industry').optional().isString(),
      check('location').exists().isString().isISO31661Alpha2(),
      check('base_currency').exists().isISO4217(),
      check('timezone').exists().isIn(moment.tz.names()),
--- a/packages/server/src/before.ts
+++ b/packages/server/src/before.ts
@@ -4,7 +4,6 @@ import moment from 'moment';
 global.__root_dir = path.join(__dirname, '..');
 global.__resources_dir = path.join(global.__root_dir, 'resources');
 global.__locales_dir = path.join(global.__resources_dir, 'locales');
-global.__views_dir = path.join(global.__root_dir, 'views');

 moment.prototype.toMySqlDateTime = function () {
  return this.format('YYYY-MM-DD HH:mm:ss');
--- a/packages/server/src/config/index.ts
+++ b/packages/server/src/config/index.ts
@@ -1,6 +1,5 @@
 import dotenv from 'dotenv';
 import path from 'path';
-import { castCommaListEnvVarToArray, parseBoolean } from '@/utils';

 dotenv.config();

@@ -95,15 +94,16 @@ module.exports = {
   * JWT secret.
   */
  jwtSecret: process.env.JWT_SECRET,
-
-  /**
-   * 
-   */
  resetPasswordSeconds: 600,

  /**
-   * Application base URL.
+   *
   */
+  customerSuccess: {
+    email: 'success@bigcapital.ly',
+    phoneNumber: '(218) 92 791 8381',
+  },
+
  baseURL: process.env.BASE_URL,

  /**
@@ -137,16 +137,13 @@ module.exports = {
  },

  /**
-   * Sign-up restrictions
+   * Users registeration configuration.
   */
-  signupRestrictions: {
-    disabled: parseBoolean<boolean>(process.env.SIGNUP_DISABLED, false),
-    allowedDomains: castCommaListEnvVarToArray(
-      process.env.SIGNUP_ALLOWED_DOMAINS
-    ),
-    allowedEmails: castCommaListEnvVarToArray(
-      process.env.SIGNUP_ALLOWED_EMAILS
-    ),
+  registration: {
+    countries: {
+      whitelist: ['LY'],
+      blacklist: [],
+    },
  },

  /**
@@ -156,6 +153,8 @@ module.exports = {
    browserWSEndpoint: process.env.BROWSER_WS_ENDPOINT,
  },

+  protocol: '',
+  hostname: '',
  scheduleComputeItemCost: 'in 5 seconds',

  /**
--- a/packages/server/src/database/seeds/core/20190423085242_seed_accounts.ts
+++ b/packages/server/src/database/seeds/core/20190423085242_seed_accounts.ts
@@ -3,17 +3,17 @@ import AccountsData from '../data/accounts';

 export default class SeedAccounts extends TenantSeeder {
  /**
-   * Seeds initial accounts to the organization.
+   * Seeds initial accounts to the organization. 
   */
  up(knex) {
-    const data = AccountsData.map((account) => ({
-      ...account,
-      name: this.i18n.__(account.name),
-      description: this.i18n.__(account.description),
-      currencyCode: this.tenant.metadata.baseCurrency,
-      seededAt: new Date(),
-    })
-);
+    const data = AccountsData.map((account) => {
+      return {
+        ...account,
+        name: this.i18n.__(account.name),
+        description: this.i18n.__(account.description),
+        currencyCode: this.tenant.metadata.baseCurrency,
+      };
+    });
    return knex('accounts').then(async () => {
      // Inserts seed entries.
      return knex('accounts').insert(data);
--- a/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts
+++ b/packages/server/src/database/seeds/core/20200810121809_seed_settings.ts
@@ -8,7 +8,7 @@ export default class SeedSettings extends TenantSeeder {
  up() {
    const settings = [
      // Orgnization settings.
-      { group: 'organization', key: 'accounting_basis', value: 'accrual' },
+      { group: 'organization', key: 'accounting_basis', value: 'accural' },

      // Accounts settings.
      { group: 'accounts', key: 'account_code_unique', value: true },
--- a/packages/server/src/interfaces/Account.ts
+++ b/packages/server/src/interfaces/Account.ts
@@ -79,15 +79,9 @@ export interface IAccountTransaction {
 }
 export interface IAccountResponse extends IAccount {}

-export enum IAccountsStructureType {
-  Tree = 'tree',
-  Flat = 'flat',
-}
-
 export interface IAccountsFilter extends IDynamicListFilterDTO {
  stringifiedFilterRoles?: string;
  onlyInactive: boolean;
-  structure?: IAccountsStructureType;
 }

 export interface IAccountType {
--- a/packages/server/src/interfaces/Authentication.ts
+++ b/packages/server/src/interfaces/Authentication.ts
@@ -74,8 +74,4 @@ export interface IAuthSendingResetPassword {
 export interface IAuthSendedResetPassword {
  user: ISystemUser,
  token: string;
-}
-
-export interface IAuthGetMetaPOJO  {
-  signupDisabled: boolean;
 }
--- a/packages/server/src/interfaces/BalanceSheet.ts
+++ b/packages/server/src/interfaces/BalanceSheet.ts
@@ -44,7 +44,7 @@ export interface IBalanceSheetQuery extends IFinancialSheetBranchesQuery {
  numberFormat: INumberFormatQuery;
  noneTransactions: boolean;
  noneZero: boolean;
-  basis: 'cash' | 'accrual';
+  basis: 'cash' | 'accural';
  accountIds: number[];

  percentageOfColumn: boolean;
--- a/packages/server/src/interfaces/Ledger.ts
+++ b/packages/server/src/interfaces/Ledger.ts
@@ -4,8 +4,6 @@ export interface ILedger {

  getEntries(): ILedgerEntry[];

-  filter(cb: (entry: ILedgerEntry) => boolean): ILedger;
-
  whereAccountId(accountId: number): ILedger;
  whereContactId(contactId: number): ILedger;
  whereFromDate(fromDate: Date | string): ILedger;
@@ -41,8 +39,6 @@ export interface ILedgerEntry {
  index: number;
  indexGroup?: number;

-  note?: string;
-
  userId?: number;
  itemId?: number;
  branchId?: number;
--- a/packages/server/src/interfaces/TrialBalanceSheet.ts
+++ b/packages/server/src/interfaces/TrialBalanceSheet.ts
@@ -4,7 +4,7 @@ export interface ITrialBalanceSheetQuery {
  fromDate: Date | string;
  toDate: Date | string;
  numberFormat: INumberFormatQuery;
-  basis: 'cash' | 'accrual';
+  basis: 'cash' | 'accural';
  noneZero: boolean;
  noneTransactions: boolean;
  onlyActive: boolean;
--- a/packages/server/src/interfaces/User.ts
+++ b/packages/server/src/interfaces/User.ts
@@ -1,7 +1,6 @@
 import { AnyObject } from '@casl/ability/dist/types/types';
 import { ITenant } from '@/interfaces';
 import { Model } from 'objection';
-import { Tenant } from '@/system/models';

 export interface ISystemUser extends Model {
  id: number;
@@ -55,52 +54,20 @@ export interface IUserInvite {

 export interface IInviteUserService {
  acceptInvite(token: string, inviteUserInput: IInviteUserInput): Promise<void>;
-
-  /**
-   * Re-send user invite.
-   * @param {number} tenantId -
-   * @param {string} email    -
-   * @return {Promise<{ invite: IUserInvite }>}
-   */
  resendInvite(
    tenantId: number,
    userId: number,
    authorizedUser: ISystemUser
  ): Promise<{
-    user: ITenantUser;
+    invite: IUserInvite;
  }>;
-
-  /**
-   * Sends invite mail to the given email from the given tenant and user.
-   * @param {number} tenantId -
-   * @param {string} email -
-   * @param {IUser} authorizedUser -
-   * @return {Promise<IUserInvite>}
-   */
  sendInvite(
    tenantId: number,
-    sendInviteDTO: IUserSendInviteDTO,
+    email: string,
    authorizedUser: ISystemUser
  ): Promise<{
-    invitedUser: ITenantUser;
+    invite: IUserInvite;
  }>;
-}
-
-export interface IAcceptInviteUserService {
-  /**
-   * Accept the received invite.
-   * @param {string} token
-   * @param {IInviteUserInput} inviteUserInput
-   * @throws {ServiceErrors}
-   * @returns {Promise<void>}
-   */
-  acceptInvite(token: string, inviteUserDTO: IInviteUserInput): Promise<void>;
-
-  /**
-   * Validate the given invite token.
-   * @param {string} token - the given token string.
-   * @throws {ServiceError}
-   */
  checkInvite(
    token: string
  ): Promise<{ inviteToken: IUserInvite; orgName: object }>;
@@ -154,7 +121,7 @@ export interface IUserInvitedEventPayload {
  tenantId: number;
  user: ITenantUser;
 }
-export interface IUserInviteTenantSyncedEventPayload {
+export interface IUserInviteTenantSyncedEventPayload{
  invite: IUserInvite;
  authorizedUser: ISystemUser;
  tenantId: number;
@@ -176,10 +143,10 @@ export interface IAcceptInviteEventPayload {

 export interface ICheckInviteEventPayload {
  inviteToken: IUserInvite;
-  tenant: Tenant;
+  tenant: ITenant
 }

 export interface IUserSendInviteDTO {
  email: string;
  roleId: number;
-}
+}
--- a/packages/server/src/jobs/ResetPasswordMail.ts
+++ b/packages/server/src/jobs/ResetPasswordMail.ts
@@ -1,34 +1,38 @@
-import { Container } from 'typedi';
-import AuthenticationMailMesssages from '@/services/Authentication/AuthenticationMailMessages';
+import { Container, Inject } from 'typedi';
+import AuthenticationService from '@/services/Authentication/AuthApplication';

-export default class ResetPasswordEmailJob {
+export default class WelcomeEmailJob {
  /**
   * Constructor method.
-   * @param {Agenda} agenda
+   * @param {Agenda} agenda 
   */
  constructor(agenda) {
    agenda.define(
      'reset-password-mail',
      { priority: 'high' },
-      this.handler.bind(this)
+      this.handler.bind(this),
    );
  }

  /**
   * Handle send welcome mail job.
-   * @param {Job} job
-   * @param {Function} done
+   * @param {Job} job 
+   * @param {Function} done 
   */
  public async handler(job, done: Function): Promise<void> {
    const { data } = job.attrs;
    const { user, token } = data;
-    const authService = Container.get(AuthenticationMailMesssages);
+    const Logger = Container.get('logger');
+    const authService = Container.get(AuthenticationService);

+    Logger.info(`[send_reset_password] started.`, { data });
+  
    try {
-      await authService.sendResetPasswordMessage(user, token);
-      done();
+      await authService.mailMessages.sendResetPasswordMessage(user, token);
+      Logger.info(`[send_reset_password] finished.`, { data });
+      done()
    } catch (error) {
-      console.log(error);
+      Logger.error(`[send_reset_password] error.`, { data, error });
      done(error);
    }
  }
--- a/packages/server/src/jobs/SmsNotification.ts
+++ b/packages/server/src/jobs/SmsNotification.ts
@@ -0,0 +1,22 @@
+import { Container } from 'typedi';
+
+export default class SmsNotification {
+  constructor(agenda) {
+    agenda.define('sms-notification', { priority: 'high' }, this.handler);
+  }
+
+  /**
+   *
+   * @param {Job}job
+   */
+  async handler(job) {
+    const { message, to } = job.attrs.data;
+    const smsClient = Container.get('SMSClient');
+
+    try {
+      await smsClient.sendMessage(to, message);
+    } catch (error) {
+      done(e);
+    }
+  }
+}
--- a/packages/server/src/jobs/UserInviteMail.ts
+++ b/packages/server/src/jobs/UserInviteMail.ts
@@ -1,6 +1,5 @@
 import { Container, Inject } from 'typedi';
 import InviteUserService from '@/services/InviteUsers/AcceptInviteUser';
-import SendInviteUsersMailMessage from '@/services/InviteUsers/SendInviteUsersMailMessage';

 export default class UserInviteMailJob {
  /**
@@ -22,17 +21,24 @@ export default class UserInviteMailJob {
   */
  public async handler(job, done: Function): Promise<void> {
    const { invite, authorizedUser, tenantId } = job.attrs.data;
-    const sendInviteMailMessage = Container.get(SendInviteUsersMailMessage);
+
+    const Logger = Container.get('logger');
+    const inviteUsersService = Container.get(InviteUserService);
+
+    Logger.info(`Send invite user mail - started: ${job.attrs.data}`);

    try {
-      await sendInviteMailMessage.sendInviteMail(
+      await inviteUsersService.mailMessages.sendInviteMail(
        tenantId,
        authorizedUser,
        invite
      );
+      Logger.info(`Send invite user mail - finished: ${job.attrs.data}`);
      done();
    } catch (error) {
-      console.log(error);
+      Logger.info(
+        `Send invite user mail - error: ${job.attrs.data}, error: ${error}`
+      );
      done(error);
    }
  }
--- a/packages/server/src/jobs/WelcomeSMS.ts
+++ b/packages/server/src/jobs/WelcomeSMS.ts
@@ -0,0 +1,35 @@
+import { Container, Inject } from 'typedi';
+import AuthenticationService from '@/services/Authentication/AuthApplication';
+
+export default class WelcomeSMSJob {
+  /**
+   * Constructor method.
+   * @param {Agenda} agenda 
+   */
+  constructor(agenda) {
+    agenda.define('welcome-sms', { priority: 'high' }, this.handler);
+  }
+
+  /**
+   * Handle send welcome mail job.
+   * @param {Job} job 
+   * @param {Function} done 
+   */
+  public async handler(job, done: Function): Promise<void> {
+    const { tenant, user } = job.attrs.data;
+
+    const Logger = Container.get('logger');
+    const authService = Container.get(AuthenticationService);
+
+    Logger.info(`[welcome_sms] started: ${job.attrs.data}`);
+
+    try {
+      await authService.smsMessages.sendWelcomeMessage(tenant, user);
+      Logger.info(`[welcome_sms] finished`, { tenant, user });
+      done();
+    } catch (error) {
+      Logger.info(`[welcome_sms] error`, { error, tenant, user });
+      done(error);
+    }
+  }
+}
--- a/packages/server/src/jobs/welcomeEmail.ts
+++ b/packages/server/src/jobs/welcomeEmail.ts
@@ -0,0 +1,39 @@
+import { Container } from 'typedi';
+import AuthenticationService from '@/services/Authentication/AuthApplication';
+
+export default class WelcomeEmailJob {
+  /**
+   * Constructor method.
+   * @param {Agenda} agenda - 
+   */
+  constructor(agenda) {
+    // Welcome mail and SMS message.
+    agenda.define(
+      'welcome-email',
+      { priority: 'high' },
+      this.handler.bind(this),
+    );
+  }
+
+  /**
+   * Handle send welcome mail job.
+   * @param {Job} job 
+   * @param {Function} done 
+   */
+  public async handler(job, done: Function): Promise<void> {
+    const { organizationId, user } = job.attrs.data;
+    const Logger: any = Container.get('logger');
+    const authService = Container.get(AuthenticationService);
+
+    Logger.info(`[welcome_mail] started: ${job.attrs.data}`);
+
+    try {
+      await authService.mailMessages.sendWelcomeMessage(user, organizationId);
+      Logger.info(`[welcome_mail] finished: ${job.attrs.data}`);
+      done();
+    } catch (error) {
+      Logger.error(`[welcome_mail] error: ${job.attrs.data}, error: ${error}`);
+      done(error);
+    }
+  }
+}
--- a/packages/server/src/jobs/writeInvoicesJEntries.ts
+++ b/packages/server/src/jobs/writeInvoicesJEntries.ts
--- a/packages/server/src/lib/Mail/index.ts
+++ b/packages/server/src/lib/Mail/index.ts
@@ -109,7 +109,7 @@ export default class Mail {
   * Retrieve view content from the view directory.
   */
  private getViewContent(): string {
-    const filePath = path.join(global.__views_dir, `/${this.view}`);
+    const filePath = path.join(global.__root_dir, `../views/${this.view}`);
    return fs.readFileSync(filePath, 'utf8');
  }
 }
--- a/packages/server/src/lib/Transformer/Transformer.ts
+++ b/packages/server/src/lib/Transformer/Transformer.ts
@@ -2,7 +2,6 @@ import moment from 'moment';
 import * as R from 'ramda';
 import { includes, isFunction, isObject, isUndefined, omit } from 'lodash';
 import { formatNumber } from 'utils';
-import { isArrayLikeObject } from 'lodash/fp';

 export class Transformer {
  public context: any;
@@ -40,33 +39,12 @@ export class Transformer {
    return object;
  };

-  /**
-   *
-   * @param object
-   * @returns
-   */
-  protected preCollectionTransform = (object: any) => {
-    return object;
-  };
-
-  /**
-   *
-   * @param object
-   * @returns
-   */
-  protected postCollectionTransform = (object: any) => {
-    return object;
-  };
-
  /**
   *
   */
  public work = (object: any) => {
    if (Array.isArray(object)) {
-      const preTransformed = this.preCollectionTransform(object);
-      const transformed = preTransformed.map(this.getTransformation);
-
-      return this.postCollectionTransform(transformed);
+      return object.map(this.getTransformation);
    } else if (isObject(object)) {
      return this.getTransformation(object);
    }
--- a/packages/server/src/loaders/eventEmitter.ts
+++ b/packages/server/src/loaders/eventEmitter.ts
@@ -22,7 +22,7 @@ import SaleInvoiceAutoIncrementSubscriber from '@/subscribers/SaleInvoices/AutoI
 import SaleInvoiceConvertFromEstimateSubscriber from '@/subscribers/SaleInvoices/ConvertFromEstimate';
 import PaymentReceiveAutoSerialSubscriber from '@/subscribers/PaymentReceive/AutoSerialIncrement';
 import SyncSystemSendInvite from '@/services/InviteUsers/SyncSystemSendInvite';
-import InviteSendMainNotification from '@/services/InviteUsers/InviteSendMailNotificationSubscribe';
+import InviteSendMainNotification from '@/services/InviteUsers/InviteSendMailNotification';
 import SyncTenantAcceptInvite from '@/services/InviteUsers/SyncTenantAcceptInvite';
 import SyncTenantUserMutate from '@/services/Users/SyncTenantUserSaved';
 import { SyncTenantUserDelete } from '@/services/Users/SyncTenantUserDeleted';
@@ -31,6 +31,7 @@ import OrgBuildSmsNotificationSubscriber from '@/subscribers/Organization/BuildS
 import PurgeUserAbilityCache from '@/services/Users/PurgeUserAbilityCache';
 import ResetLoginThrottleSubscriber from '@/subscribers/Authentication/ResetLoginThrottle';
 import AuthenticationSubscriber from '@/subscribers/Authentication/SendResetPasswordMail';
+import AuthSendWelcomeMailSubscriber from '@/subscribers/Authentication/SendWelcomeMail';
 import PurgeAuthorizedUserOnceRoleMutate from '@/services/Roles/PurgeAuthorizedUser';
 import SendSmsNotificationToCustomer from '@/subscribers/SaleInvoices/SendSmsNotificationToCustomer';
 import SendSmsNotificationSaleReceipt from '@/subscribers/SaleReceipt/SendSmsNotificationToCustomer';
@@ -119,6 +120,7 @@ export const susbcribers = () => {
    PurgeUserAbilityCache,
    ResetLoginThrottleSubscriber,
    AuthenticationSubscriber,
+    AuthSendWelcomeMailSubscriber,
    PurgeAuthorizedUserOnceRoleMutate,
    SendSmsNotificationToCustomer,
    SendSmsNotificationSaleReceipt,
--- a/packages/server/src/loaders/jobs.ts
+++ b/packages/server/src/loaders/jobs.ts
@@ -1,18 +1,24 @@
 import Agenda from 'agenda';
+import WelcomeEmailJob from 'jobs/welcomeEmail';
+import WelcomeSMSJob from 'jobs/WelcomeSMS';
 import ResetPasswordMailJob from 'jobs/ResetPasswordMail';
 import ComputeItemCost from 'jobs/ComputeItemCost';
-import RewriteInvoicesJournalEntries from 'jobs/WriteInvoicesJEntries';
+import RewriteInvoicesJournalEntries from 'jobs/writeInvoicesJEntries';
 import UserInviteMailJob from 'jobs/UserInviteMail';
 import OrganizationSetupJob from 'jobs/OrganizationSetup';
 import OrganizationUpgrade from 'jobs/OrganizationUpgrade';
+import SmsNotification from 'jobs/SmsNotification';

 export default ({ agenda }: { agenda: Agenda }) => {
+  new WelcomeEmailJob(agenda);
  new ResetPasswordMailJob(agenda);
+  new WelcomeSMSJob(agenda);
  new UserInviteMailJob(agenda);
  new ComputeItemCost(agenda);
  new RewriteInvoicesJournalEntries(agenda);
  new OrganizationSetupJob(agenda);
  new OrganizationUpgrade(agenda);
+  new SmsNotification(agenda);

  agenda.start();
 };
--- a/packages/server/src/services/Accounting/LedgerContactStorage.ts
+++ b/packages/server/src/services/Accounting/LedgerContactStorage.ts
@@ -1,14 +1,9 @@
 import { Service, Inject } from 'typedi';
 import async from 'async';
 import { Knex } from 'knex';
-import {
-  ILedger,
-  ILedgerEntry,
-  ISaleContactsBalanceQueuePayload,
-} from '@/interfaces';
+import { ILedger, ISaleContactsBalanceQueuePayload } from '@/interfaces';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { TenantMetadata } from '@/system/models';
-import { ACCOUNT_TYPE } from '@/data/AccountTypes';

@Service()
 export class LedgerContactsBalanceStorage {
@@ -54,29 +49,6 @@ export class LedgerContactsBalanceStorage {
    await this.saveContactBalance(tenantId, ledger, contactId, trx);
  };

-  /**
-   * Filters AP/AR ledger entries.
-   * @param {number} tenantId
-   * @param {Knex.Transaction} trx
-   * @returns {Promise<(entry: ILedgerEntry) => boolean>}
-   */
-  private filterARAPLedgerEntris = async (
-    tenantId: number,
-    trx?: Knex.Transaction
-  ): Promise<(entry: ILedgerEntry) => boolean> => {
-    const { Account } = this.tenancy.models(tenantId);
-
-    const ARAPAcounts = await Account.query(trx).whereIn('accountType', [
-      ACCOUNT_TYPE.ACCOUNTS_RECEIVABLE,
-      ACCOUNT_TYPE.ACCOUNTS_PAYABLE,
-    ]);
-    const ARAPAcountsIds = ARAPAcounts.map((a) => a.id);
-
-    return (entry: ILedgerEntry) => {
-      return ARAPAcountsIds.indexOf(entry.accountId) !== -1;
-    };
-  };
-
  /**
   *
   * @param   {number} tenantId
@@ -91,24 +63,16 @@ export class LedgerContactsBalanceStorage {
    trx?: Knex.Transaction
  ): Promise<void> => {
    const { Contact } = this.tenancy.models(tenantId);
-    const contact = await Contact.query(trx).findById(contactId);
+    const contact = await Contact.query().findById(contactId);

    // Retrieves the given tenant metadata.
    const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
-
+    
    // Detarmines whether the contact has foreign currency.
    const isForeignContact = contact.currencyCode !== tenantMeta.baseCurrency;

    // Filters the ledger base on the given contact id.
-    const filterARAPLedgerEntris = await this.filterARAPLedgerEntris(
-      tenantId,
-      trx
-    );
-    const contactLedger = ledger
-      // Filter entries only that have contact id.
-      .whereContactId(contactId)
-      // Filter entries on AR/AP accounts.
-      .filter(filterARAPLedgerEntris);
+    const contactLedger = ledger.whereContactId(contactId);

    const closingBalance = isForeignContact
      ? contactLedger
--- a/packages/server/src/services/Accounting/LedgerStorageRevert.ts
+++ b/packages/server/src/services/Accounting/LedgerStorageRevert.ts
@@ -10,7 +10,7 @@ export class LedgerRevert {
  private tenancy: HasTenancyService;

  @Inject()
-  private ledgerStorage: LedgerStorageService;
+  ledgerStorage: LedgerStorageService;

  /**
   * Reverts the jouranl entries.
--- a/packages/server/src/services/Accounting/utils.ts
+++ b/packages/server/src/services/Accounting/utils.ts
@@ -21,8 +21,6 @@ export const transformLedgerEntryToTransaction = (
    transactionNumber: entry.transactionNumber,
    referenceNumber: entry.referenceNumber,

-    note: entry.note,
-
    index: entry.index,
    indexGroup: entry.indexGroup,

--- a/packages/server/src/services/Accounts/AccountTransform.ts
+++ b/packages/server/src/services/Accounts/AccountTransform.ts
@@ -1,11 +1,6 @@
-import { IAccount, IAccountsStructureType } from '@/interfaces';
+import { IAccount } from '@/interfaces';
 import { Transformer } from '@/lib/Transformer/Transformer';
-import {
-  assocDepthLevelToObjectTree,
-  flatToNestedArray,
-  formatNumber,
-  nestedArrayToFlatten,
-} from 'utils';
+import { formatNumber } from 'utils';

 export class AccountTransformer extends Transformer {
  /**
@@ -13,23 +8,7 @@ export class AccountTransformer extends Transformer {
   * @returns {Array}
   */
  public includeAttributes = (): string[] => {
-    return ['formattedAmount', 'flattenName'];
-  };
-
-  /**
-   * Retrieves the flatten name with all dependants accounts names.
-   * @param {IAccount} account -
-   * @returns {string}
-   */
-  public flattenName = (account: IAccount): string => {
-    const parentDependantsIds = this.options.accountsGraph.dependantsOf(
-      account.id
-    );
-    const prefixAccounts = parentDependantsIds.map((dependId) => {
-      const node = this.options.accountsGraph.getNodeData(dependId);
-      return `${node.name}: `;
-    });
-    return `${prefixAccounts}${account.name}`;
+    return ['formattedAmount'];
  };

  /**
@@ -38,28 +17,8 @@ export class AccountTransformer extends Transformer {
   * @returns {string}
   */
  protected formattedAmount = (account: IAccount): string => {
-    return formatNumber(account.amount, { currencyCode: account.currencyCode });
-  };
-
-  /**
-   * Transformes the accounts collection to flat or nested array.
-   * @param {IAccount[]}
-   * @returns {IAccount[]}
-   */
-  protected postCollectionTransform = (accounts: IAccount[]) => {
-    // Transfom the flatten to accounts tree.
-    const transformed = flatToNestedArray(accounts, {
-      id: 'id',
-      parentId: 'parentAccountId',
+    return formatNumber(account.amount, {
+      currencyCode: account.currencyCode,
    });
-    // Associate `accountLevel` attr to indicate object depth.
-    const transformed2 = assocDepthLevelToObjectTree(
-      transformed,
-      1,
-      'accountLevel'
-    );
-    return this.options.structure === IAccountsStructureType.Flat
-      ? nestedArrayToFlatten(transformed2)
-      : transformed2;
  };
 }
--- a/packages/server/src/services/Accounts/GetAccount.ts
+++ b/packages/server/src/services/Accounts/GetAccount.ts
@@ -22,19 +22,15 @@ export class GetAccount {
   */
  public getAccount = async (tenantId: number, accountId: number) => {
    const { Account } = this.tenancy.models(tenantId);
-    const { accountRepository } = this.tenancy.repositories(tenantId);

    // Find the given account or throw not found error.
    const account = await Account.query().findById(accountId).throwIfNotFound();

-    const accountsGraph = await accountRepository.getDependencyGraph();
-
    // Transformes the account model to POJO.
    const transformed = await this.transformer.transform(
      tenantId,
      account,
-      new AccountTransformer(),
-      { accountsGraph }
+      new AccountTransformer()
    );
    return this.i18nService.i18nApply(
      [['accountTypeLabel'], ['accountNormalFormatted']],
--- a/packages/server/src/services/Accounts/GetAccounts.ts
+++ b/packages/server/src/services/Accounts/GetAccounts.ts
@@ -1,11 +1,6 @@
 import { Inject, Service } from 'typedi';
 import * as R from 'ramda';
-import {
-  IAccountsFilter,
-  IAccountResponse,
-  IFilterMeta,
-  IAccountsStructureType,
-} from '@/interfaces';
+import { IAccountsFilter, IAccountResponse, IFilterMeta } from '@/interfaces';
 import TenancyService from '@/services/Tenancy/TenancyService';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import { AccountTransformer } from './AccountTransform';
@@ -43,7 +38,6 @@ export class GetAccounts {
    filterDTO: IAccountsFilter
  ): Promise<{ accounts: IAccountResponse[]; filterMeta: IFilterMeta }> => {
    const { Account } = this.tenancy.models(tenantId);
-    const { accountRepository } = this.tenancy.repositories(tenantId);

    // Parses the stringified filter roles.
    const filter = this.parseListFilterDTO(filterDTO);
@@ -59,16 +53,17 @@ export class GetAccounts {
      dynamicList.buildQuery()(builder);
      builder.modify('inactiveMode', filter.inactiveMode);
    });
-
-    const accountsGraph = await accountRepository.getDependencyGraph();
-
-    // Retrieves the transformed accounts collection.
-    const transformedAccounts = await this.transformer.transform(
+    // Retrievs the formatted accounts collection.
+    const preTransformedAccounts = await this.transformer.transform(
      tenantId,
      accounts,
-      new AccountTransformer(),
-      { accountsGraph, structure: filterDTO.structure }
+      new AccountTransformer()
    );
+    // Transform accounts to nested array.
+    const transformedAccounts = flatToNestedArray(preTransformedAccounts, {
+      id: 'id',
+      parentId: 'parentAccountId',
+    });

    return {
      accounts: transformedAccounts,
--- a/packages/server/src/services/Authentication/AuthApplication.ts
+++ b/packages/server/src/services/Authentication/AuthApplication.ts
@@ -1,14 +1,8 @@
 import { Service, Inject, Container } from 'typedi';
-import {
-  IRegisterDTO,
-  ISystemUser,
-  IPasswordReset,
-  IAuthGetMetaPOJO,
-} from '@/interfaces';
+import { IRegisterDTO, ISystemUser, IPasswordReset } from '@/interfaces';
 import { AuthSigninService } from './AuthSignin';
 import { AuthSignupService } from './AuthSignup';
 import { AuthSendResetPassword } from './AuthSendResetPassword';
-import { GetAuthMeta } from './GetAuthMeta';

@Service()
 export default class AuthenticationApplication {
@@ -21,9 +15,6 @@ export default class AuthenticationApplication {
  @Inject()
  private authResetPasswordService: AuthSendResetPassword;

-  @Inject()
-  private authGetMeta: GetAuthMeta;
-
  /**
   * Signin and generates JWT token.
   * @throws {ServiceError}
@@ -62,12 +53,4 @@ export default class AuthenticationApplication {
  public async resetPassword(token: string, password: string): Promise<void> {
    return this.authResetPasswordService.resetPassword(token, password);
  }
-
-  /**
-   * Retrieves the authentication meta for SPA.
-   * @returns {Promise<IAuthGetMetaPOJO>}
-   */
-  public async getAuthMeta(): Promise<IAuthGetMetaPOJO> {
-    return this.authGetMeta.getAuthMeta();
-  }
 }
--- a/packages/server/src/services/Authentication/AuthSignup.ts
+++ b/packages/server/src/services/Authentication/AuthSignup.ts
@@ -1,4 +1,4 @@
-import { isEmpty, omit } from 'lodash';
+import { omit } from 'lodash';
 import moment from 'moment';
 import { ServiceError } from '@/exceptions';
 import {
@@ -13,7 +13,6 @@ import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import TenantsManagerService from '../Tenancy/TenantsManager';
 import events from '@/subscribers/events';
 import { hashPassword } from '@/utils';
-import config from '@/config';

 export class AuthSignupService {
  @Inject()
@@ -34,9 +33,6 @@ export class AuthSignupService {
  public async signUp(signupDTO: IRegisterDTO): Promise<ISystemUser> {
    const { systemUserRepository } = this.sysRepositories;

-    // Validates the signup disable restrictions.
-    await this.validateSignupRestrictions(signupDTO.email);
-
    // Validates the given email uniqiness.
    await this.validateEmailUniqiness(signupDTO.email);

@@ -78,34 +74,4 @@ export class AuthSignupService {
      throw new ServiceError(ERRORS.EMAIL_EXISTS);
    }
  }
-
-  /**
-   * Validate sign-up disable restrictions.
-   * @param {string} email
-   */
-  private async validateSignupRestrictions(email: string) {
-    // Can't continue if the signup is not disabled.
-    if (!config.signupRestrictions.disabled) return;
-
-    // Validate the allowed email addresses and domains.
-    if (
-      !isEmpty(config.signupRestrictions.allowedEmails) ||
-      !isEmpty(config.signupRestrictions.allowedDomains)
-    ) {
-      const emailDomain = email.split('@').pop();
-      const isAllowedEmail =
-        config.signupRestrictions.allowedEmails.indexOf(email) !== -1;
-
-      const isAllowedDomain = config.signupRestrictions.allowedDomains.some(
-        (domain) => emailDomain === domain
-      );
-
-      if (!isAllowedEmail && !isAllowedDomain) {
-        throw new ServiceError(ERRORS.SIGNUP_RESTRICTED_NOT_ALLOWED);
-      }
-      // Throw error if the signup is disabled with no exceptions.
-    } else {
-      throw new ServiceError(ERRORS.SIGNUP_RESTRICTED);
-    }
-  }
 }
--- a/packages/server/src/services/Authentication/AuthenticationMailMessages.ts
+++ b/packages/server/src/services/Authentication/AuthenticationMailMessages.ts
@@ -5,24 +5,59 @@ import Mail from '@/lib/Mail';

@Service()
 export default class AuthenticationMailMesssages {
+  /**
+   * Sends welcome message.
+   * @param {ISystemUser} user - The system user.
+   * @param {string} organizationName -
+   * @return {Promise<void>}
+   */
+  async sendWelcomeMessage(
+    user: ISystemUser,
+    organizationId: string
+  ): Promise<void> {
+    const root = __dirname + '/../../../views/images/bigcapital.png';
+
+    const mail = new Mail()
+      .setView('mail/Welcome.html')
+      .setSubject('Welcome to Bigcapital')
+      .setTo(user.email)
+      .setAttachments([
+        {
+          filename: 'bigcapital.png',
+          path: root,
+          cid: 'bigcapital_logo',
+        },
+      ])
+      .setData({
+        firstName: user.firstName,
+        organizationId,
+        successPhoneNumber: config.customerSuccess.phoneNumber,
+        successEmail: config.customerSuccess.email,
+      });
+
+    await mail.send();
+  }
+
  /**
   * Sends reset password message.
   * @param {ISystemUser} user - The system user.
   * @param {string} token - Reset password token.
   * @return {Promise<void>}
   */
-  public async sendResetPasswordMessage(
+  async sendResetPasswordMessage(
    user: ISystemUser,
    token: string
  ): Promise<void> {
-    await new Mail()
+    const root = __dirname + '/../../../views/images/bigcapital.png';
+
+    const mail = new Mail()
      .setSubject('Bigcapital - Password Reset')
      .setView('mail/ResetPassword.html')
      .setTo(user.email)
      .setAttachments([
        {
          filename: 'bigcapital.png',
-          path: `${global.__views_dir}/images/bigcapital.png`,
+          path: root,
          cid: 'bigcapital_logo',
        },
      ])
@@ -30,7 +65,9 @@ export default class AuthenticationMailMesssages {
        resetPasswordUrl: `${config.baseURL}/auth/reset_password/${token}`,
        first_name: user.firstName,
        last_name: user.lastName,
-      })
-      .send();
+        contact_us_email: config.contactUsMail,
+      });
+
+    await mail.send();
  }
 }
--- a/packages/server/src/services/Authentication/AuthenticationSMSMessages.ts
+++ b/packages/server/src/services/Authentication/AuthenticationSMSMessages.ts
@@ -0,0 +1,19 @@
+import { Service, Inject } from 'typedi';
+import { ISystemUser, ITenant } from '@/interfaces';
+
+@Service()
+export default class AuthenticationSMSMessages {
+  @Inject('SMSClient')
+  smsClient: any;
+
+  /**
+   * Sends welcome sms message.
+   * @param {ITenant} tenant
+   * @param {ISystemUser} user
+   */
+  sendWelcomeMessage(tenant: ITenant, user: ISystemUser) {
+    const message: string = `Hi ${user.firstName}, Welcome to Bigcapital, You've joined the new workspace, if you need any help please don't hesitate to contact us.`;
+
+    return this.smsClient.sendMessage(user.phoneNumber, message);
+  }
+}
--- a/packages/server/src/services/Authentication/GetAuthMeta.ts
+++ b/packages/server/src/services/Authentication/GetAuthMeta.ts
@@ -1,16 +0,0 @@
-import { Service } from 'typedi';
-import { IAuthGetMetaPOJO } from '@/interfaces';
-import config from '@/config';
-
-@Service()
-export class GetAuthMeta {
-  /**
-   * Retrieves the authentication meta for SPA.
-   * @returns {Promise<IAuthGetMetaPOJO>}
-   */
-  public async getAuthMeta(): Promise<IAuthGetMetaPOJO> {
-    return {
-      signupDisabled: config.signupRestrictions.disabled,
-    };
-  }
-}
--- a/packages/server/src/services/Authentication/_constants.ts
+++ b/packages/server/src/services/Authentication/_constants.ts
@@ -7,6 +7,4 @@ export const ERRORS = {
  TOKEN_EXPIRED: 'TOKEN_EXPIRED',
  PHONE_NUMBER_EXISTS: 'PHONE_NUMBER_EXISTS',
  EMAIL_EXISTS: 'EMAIL_EXISTS',
-  SIGNUP_RESTRICTED_NOT_ALLOWED: 'SIGNUP_RESTRICTED_NOT_ALLOWED',
-  SIGNUP_RESTRICTED: 'SIGNUP_RESTRICTED',
 };
--- a/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts
+++ b/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts
@@ -25,8 +25,8 @@ export default class CashflowTransactionJournalEntries {

  /**
   * Retrieves the common entry of cashflow transaction.
-   * @param {ICashflowTransaction} cashflowTransaction
-   * @returns {Partial<ILedgerEntry>}
+   * @param   {ICashflowTransaction} cashflowTransaction
+   * @returns {}
   */
  private getCommonEntry = (cashflowTransaction: ICashflowTransaction) => {
    const { entries, ...transaction } = cashflowTransaction;
@@ -41,9 +41,7 @@ export default class CashflowTransactionJournalEntries {
      ),
      transactionId: transaction.id,
      transactionNumber: transaction.transactionNumber,
-      referenceNumber: transaction.referenceNo,
-
-      note: transaction.description,
+      referenceNo: transaction.referenceNo,

      branchId: cashflowTransaction.branchId,
      userId: cashflowTransaction.userId,
@@ -78,9 +76,9 @@ export default class CashflowTransactionJournalEntries {

  /**
   * Retrieves the cashflow credit GL entry.
-   * @param {ICashflowTransaction} cashflowTransaction
-   * @param {ICashflowTransactionLine} entry
-   * @param {number} index
+   * @param   {ICashflowTransaction} cashflowTransaction
+   * @param   {ICashflowTransactionLine} entry
+   * @param   {number} index
   * @returns {ILedgerEntry}
   */
  private getCashflowCreditGLEntry = (
@@ -104,10 +102,10 @@ export default class CashflowTransactionJournalEntries {

  /**
   * Retrieves the cashflow transaction GL entry.
-   * @param {ICashflowTransaction} cashflowTransaction
-   * @param {ICashflowTransactionLine} entry
-   * @param {number} index
-   * @returns {ILedgerEntry[]}
+   * @param   {ICashflowTransaction} cashflowTransaction
+   * @param   {ICashflowTransactionLine} entry
+   * @param   {number} index
+   * @returns
   */
  private getJournalEntries = (
    cashflowTransaction: ICashflowTransaction
@@ -120,7 +118,7 @@ export default class CashflowTransactionJournalEntries {

  /**
   * Retrieves the cashflow GL ledger.
-   * @param {ICashflowTransaction} cashflowTransaction
+   * @param   {ICashflowTransaction} cashflowTransaction
   * @returns {Ledger}
   */
  private getCashflowLedger = (cashflowTransaction: ICashflowTransaction) => {
@@ -132,7 +130,6 @@ export default class CashflowTransactionJournalEntries {
   * Write the journal entries of the given cashflow transaction.
   * @param {number} tenantId
   * @param {ICashflowTransaction} cashflowTransaction
-   * @return {Promise<void>}
   */
  public writeJournalEntries = async (
    tenantId: number,
@@ -156,7 +153,6 @@ export default class CashflowTransactionJournalEntries {
   * Delete the journal entries.
   * @param {number} tenantId - Tenant id.
   * @param {number} cashflowTransactionId - Cashflow transaction id.
-   * @return {Promise<void>}
   */
  public revertJournalEntries = async (
    tenantId: number,
--- a/packages/server/src/services/Contacts/Customers/CRUD/CreateCustomer.ts
+++ b/packages/server/src/services/Contacts/Customers/CRUD/CreateCustomer.ts
@@ -55,7 +55,7 @@ export class CreateCustomer {
      } as ICustomerEventCreatingPayload);

      // Creates a new contact as customer.
-      const customer = await Contact.query(trx).insertAndFetch({
+      const customer = await Contact.query().insertAndFetch({
        ...customerObj,
      });
      // Triggers `onCustomerCreated` event.
--- a/packages/server/src/services/CreditNotes/CreditNoteGLEntriesSubscriber.ts
+++ b/packages/server/src/services/CreditNotes/CreditNoteGLEntriesSubscriber.ts
@@ -5,13 +5,18 @@ import {
  ICreditNoteDeletedPayload,
  ICreditNoteEditedPayload,
  ICreditNoteOpenedPayload,
+  IRefundCreditNoteOpenedPayload,
 } from '@/interfaces';
 import CreditNoteGLEntries from './CreditNoteGLEntries';
+import HasTenancyService from '@/services/Tenancy/TenancyService';

@Service()
 export default class CreditNoteGLEntriesSubscriber {
  @Inject()
-  private creditNoteGLEntries: CreditNoteGLEntries;
+  creditNoteGLEntries: CreditNoteGLEntries;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Attaches events with handlers.
--- a/packages/server/src/services/Expenses/CRUD/DeleteExpense.ts
+++ b/packages/server/src/services/Expenses/CRUD/DeleteExpense.ts
@@ -9,6 +9,7 @@ import events from '@/subscribers/events';
 import UnitOfWork from '@/services/UnitOfWork';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import { CommandExpenseValidator } from './CommandExpenseValidator';
+import { ExpenseCategory } from 'models';
 import HasTenancyService from '@/services/Tenancy/TenancyService';

@Service()
@@ -36,7 +37,7 @@ export class DeleteExpense {
    expenseId: number,
    authorizedUser: ISystemUser
  ): Promise<void> => {
-    const { Expense, ExpenseCategory } = this.tenancy.models(tenantId);
+    const { Expense } = this.tenancy.models(tenantId);

    // Retrieves the expense transaction with associated entries or
    // throw not found error.
@@ -59,7 +60,7 @@ export class DeleteExpense {
      } as IExpenseDeletingPayload);

      // Deletes expense associated entries.
-      await ExpenseCategory.query(trx).where('expenseId', expenseId).delete();
+      await ExpenseCategory.query(trx).findById(expenseId).delete();

      // Deletes expense transactions.
      await Expense.query(trx).findById(expenseId).delete();
--- a/packages/server/src/services/Expenses/ExpenseGLEntries.ts
+++ b/packages/server/src/services/Expenses/ExpenseGLEntries.ts
@@ -46,7 +46,7 @@ export class ExpenseGLEntries {
      ...commonEntry,
      credit: expense.localAmount,
      accountId: expense.paymentAccountId,
-      accountNormal: AccountNormal.DEBIT,
+      accountNormal: AccountNormal.CREDIT,
      index: 1,
    };
  };
--- a/packages/server/src/services/FinancialStatements/CashflowAccountTransactions/CashflowAccountTransactionsRepo.ts
+++ b/packages/server/src/services/FinancialStatements/CashflowAccountTransactions/CashflowAccountTransactionsRepo.ts
@@ -5,7 +5,7 @@ import { ICashflowAccountTransactionsQuery, IPaginationMeta } from '@/interfaces
@Service()
 export default class CashflowAccountTransactionsRepo {
  @Inject()
-  private tenancy: HasTenancyService;
+  tenancy: HasTenancyService;

  /**
   * Retrieve the cashflow account transactions.
--- a/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts
+++ b/packages/server/src/services/FinancialStatements/ProfitLossSheet/utils.ts
@@ -17,7 +17,7 @@ export const getDefaultPLQuery = (): IProfitLossSheetQuery => ({
    formatMoney: 'total',
    precision: 2,
  },
-  basis: 'accrual',
+  basis: 'accural',

  noneZero: false,
  noneTransactions: false,
--- a/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts
+++ b/packages/server/src/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService.ts
@@ -35,7 +35,7 @@ export default class TrialBalanceSheetService extends FinancialSheet {
        formatMoney: 'total',
        precision: 2,
      },
-      basis: 'accrual',
+      basis: 'accural',
      noneZero: false,
      noneTransactions: true,
      onlyActive: false,
--- a/packages/server/src/services/InviteUsers/AcceptInviteUser.ts
+++ b/packages/server/src/services/InviteUsers/AcceptInviteUser.ts
@@ -12,12 +12,9 @@ import {
 } from '@/interfaces';
 import { ERRORS } from './constants';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import { IAcceptInviteUserService } from '@/interfaces';

@Service()
-export default class AcceptInviteUserService
-  implements IAcceptInviteUserService
-{
+export default class AcceptInviteUserService {
  @Inject()
  private eventPublisher: EventPublisher;

--- a/packages/server/src/services/InviteUsers/InviteSendMailNotificationSubscribe.ts
+++ b/packages/server/src/services/InviteUsers/InviteSendMailNotificationSubscribe.ts
@@ -1,4 +1,7 @@
-import { IUserInviteTenantSyncedEventPayload } from '@/interfaces';
+import {
+  IUserInvitedEventPayload,
+  IUserInviteTenantSyncedEventPayload,
+} from '@/interfaces';
 import events from '@/subscribers/events';
 import { Inject, Service } from 'typedi';

--- a/packages/server/src/services/InviteUsers/SendInviteUsersMailMessage.ts
+++ b/packages/server/src/services/InviteUsers/SendInviteUsersMailMessage.ts
@@ -1,12 +1,12 @@
-import path from 'path';
 import { ISystemUser } from '@/interfaces';
+import TenancyService from '@/services/Tenancy/TenancyService';
 import Mail from '@/lib/Mail';
-import { Service } from 'typedi';
-import { Tenant } from '@/system/models';
+import { Service, Container } from 'typedi';
 import config from '@/config';
+import { Tenant } from '@/system/models';

@Service()
-export default class SendInviteUsersMailMessage {
+export default class InviteUsersMailMessages {
  /**
   * Sends invite mail to the given email.
   * @param user
@@ -18,7 +18,7 @@ export default class SendInviteUsersMailMessage {
      .findById(tenantId)
      .withGraphFetched('metadata');

-    const root = path.join(global.__views_dir, '/images/bigcapital.png');
+    const root = __dirname + '/../../../views/images/bigcapital.png';

    const mail = new Mail()
      .setSubject(`${fromUser.firstName} has invited you to join a Bigcapital`)
--- a/packages/server/src/services/InviteUsers/InviteUsersSMSMessages.ts
+++ b/packages/server/src/services/InviteUsers/InviteUsersSMSMessages.ts
--- a/packages/server/src/services/InviteUsers/SyncTenantAcceptInvite.ts
+++ b/packages/server/src/services/InviteUsers/SyncTenantAcceptInvite.ts
@@ -8,7 +8,7 @@ import { IAcceptInviteEventPayload } from '@/interfaces';
@Service()
 export default class SyncTenantAcceptInvite {
  @Inject()
-  private tenancy: HasTenancyService;
+  tenancy: HasTenancyService;

  /**
   * Attaches events with handlers.
--- a/packages/server/src/services/InviteUsers/TenantInviteUser.ts
+++ b/packages/server/src/services/InviteUsers/TenantInviteUser.ts
@@ -74,15 +74,17 @@ export default class InviteTenantUserService implements IInviteUserService {

  /**
   * Re-send user invite.
-   * @param {number} tenantId -
-   * @param {string} email -
+   * @param  {number} tenantId -
+   * @param  {string} email    -
   * @return {Promise<{ invite: IUserInvite }>}
   */
  public async resendInvite(
    tenantId: number,
    userId: number,
    authorizedUser: ISystemUser
-  ): Promise<{ user: ITenantUser }> {
+  ): Promise<{
+    user: ITenantUser;
+  }> {
    // Retrieve the user by id or throw not found service error.
    const user = await this.getUserByIdOrThrowError(tenantId, userId);

--- a/packages/server/src/services/ManualJournals/CommandManualJournalValidators.ts
+++ b/packages/server/src/services/ManualJournals/CommandManualJournalValidators.ts
@@ -1,10 +1,11 @@
-import { difference } from 'lodash';
+import { difference, sumBy, omit, map } from 'lodash';
 import { Service, Inject } from 'typedi';
 import { ServiceError } from '@/exceptions';
 import {
  IManualJournalDTO,
  IManualJournalEntry,
  IManualJournal,
+  IManualJournalEntryDTO,
 } from '@/interfaces';
 import TenancyService from '@/services/Tenancy/TenancyService';
 import { ERRORS } from './constants';
@@ -285,7 +286,7 @@ export class CommandManualJournalValidators {
  public validateJournalCurrencyWithAccountsCurrency = async (
    tenantId: number,
    manualJournalDTO: IManualJournalDTO,
-    baseCurrency: string
+    baseCurrency: string,
  ) => {
    const { Account } = this.tenancy.models(tenantId);

--- a/packages/server/src/services/ManualJournals/ManualJournalGLEntries.ts
+++ b/packages/server/src/services/ManualJournals/ManualJournalGLEntries.ts
@@ -3,20 +3,25 @@ import * as R from 'ramda';
 import {
  IManualJournal,
  IManualJournalEntry,
+  IAccount,
  ILedgerEntry,
 } from '@/interfaces';
 import { Knex } from 'knex';
 import Ledger from '@/services/Accounting/Ledger';
 import LedgerStorageService from '@/services/Accounting/LedgerStorageService';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
+import { LedgerRevert } from '@/services/Accounting/LedgerStorageRevert';

@Service()
 export class ManualJournalGLEntries {
  @Inject()
-  private ledgerStorage: LedgerStorageService;
+  ledgerStorage: LedgerStorageService;

  @Inject()
-  private tenancy: HasTenancyService;
+  ledgerRevert: LedgerRevert;
+
+  @Inject()
+  tenancy: HasTenancyService;

  /**
   * Create manual journal GL entries.
@@ -72,7 +77,7 @@ export class ManualJournalGLEntries {
    manualJournalId: number,
    trx?: Knex.Transaction
  ): Promise<void> => {
-    return this.ledgerStorage.deleteByReference(
+    return this.ledgerRevert.revertGLEntries(
      tenantId,
      manualJournalId,
      'Journal',
@@ -81,7 +86,7 @@ export class ManualJournalGLEntries {
  };

  /**
-   * Retrieves the ledger of the given manual journal.
+   *
   * @param   {IManualJournal} manualJournal
   * @returns {Ledger}
   */
@@ -92,13 +97,11 @@ export class ManualJournalGLEntries {
  };

  /**
-   * Retrieves the common entry details of the manual journal
+   *
   * @param   {IManualJournal} manualJournal
-   * @returns {Partial<ILedgerEntry>}
+   * @returns {}
   */
-  private getManualJournalCommonEntry = (
-    manualJournal: IManualJournal
-  ): Partial<ILedgerEntry> => {
+  private getManualJournalCommonEntry = (manualJournal: IManualJournal) => {
    return {
      transactionNumber: manualJournal.journalNumber,
      referenceNumber: manualJournal.reference,
@@ -115,8 +118,7 @@ export class ManualJournalGLEntries {
  };

  /**
-   * Retrieves the ledger entry of the given manual journal and
-   * its associated entry.
+   *
   * @param   {IManualJournal} manualJournal -
   * @param   {IManualJournalEntry} entry -
   * @returns {ILedgerEntry}
@@ -147,7 +149,7 @@ export class ManualJournalGLEntries {
  );

  /**
-   * Retrieves the ledger of the given manual journal.
+   *
   * @param   {IManualJournal} manualJournal
   * @returns {ILedgerEntry[]}
   */
--- a/packages/server/src/services/Projects/Projects/ProjectBillableBillSubscriber.ts
+++ b/packages/server/src/services/Projects/Projects/ProjectBillableBillSubscriber.ts
@@ -23,11 +23,8 @@ export class ProjectBillableBillSubscriber {
      events.saleInvoice.onCreated,
      this.handleIncreaseBillableBill
    );
-    bus.subscribe(events.saleInvoice.onEdited, this.handleEditBillableBill);
-    bus.subscribe(
-      events.saleInvoice.onDeleted,
-      this.handleDecreaseBillableBill
-    );
+    bus.subscribe(events.saleInvoice.onEdited, this.handleDecreaseBillableBill);
+    bus.subscribe(events.saleInvoice.onDeleted, this.handleEditBillableBill);
  }

  /**
--- a/packages/server/src/services/Projects/Projects/ProjectBillableExpenseInvoiced.ts
+++ b/packages/server/src/services/Projects/Projects/ProjectBillableExpenseInvoiced.ts
@@ -1,11 +1,7 @@
 import { Knex } from 'knex';
 import { Inject, Service } from 'typedi';
 import async from 'async';
-import {
-  ISaleInvoice,
-  ISaleInvoiceDTO,
-  ProjectLinkRefType,
-} from '@/interfaces';
+import { ISaleInvoice, ISaleInvoiceDTO, ProjectLinkRefType } from '@/interfaces';
 import { ProjectBillableExpense } from './ProjectBillableExpense';
 import { filterEntriesByRefType } from './_utils';

--- a/packages/server/src/services/Projects/Projects/ProjectBillableExpenseSubscriber.ts
+++ b/packages/server/src/services/Projects/Projects/ProjectBillableExpenseSubscriber.ts
@@ -21,10 +21,13 @@ export class ProjectBillableExpensesSubscriber {
      events.saleInvoice.onCreated,
      this.handleIncreaseBillableExpenses
    );
-    bus.subscribe(events.saleInvoice.onEdited, this.handleEditBillableExpenses);
+    bus.subscribe(
+      events.saleInvoice.onEdited,
+      this.handleDecreaseBillableExpenses
+    );
    bus.subscribe(
      events.saleInvoice.onDeleted,
-      this.handleDecreaseBillableExpenses
+      this.handleEditBillableExpenses
    );
  }

--- a/packages/server/src/subscribers/Authentication/SendResetPasswordMail.ts
+++ b/packages/server/src/subscribers/Authentication/SendResetPasswordMail.ts
@@ -4,7 +4,7 @@ import events from '@/subscribers/events';
@Service()
 export default class AuthenticationSubscriber {
  @Inject('agenda')
-  private agenda: any;
+  agenda: any;

  /**
   * Attaches events with handlers.
--- a/packages/server/src/subscribers/Authentication/SendWelcomeMail.ts
+++ b/packages/server/src/subscribers/Authentication/SendWelcomeMail.ts
@@ -0,0 +1,28 @@
+import { Service, Inject } from 'typedi';
+import events from '@/subscribers/events';
+
+@Service()
+export default class AuthSendWelcomeMailSubscriber {
+  @Inject('agenda')
+  agenda: any;
+
+  /**
+   * Attaches events with handlers.
+   */
+  public attach(bus) {
+    bus.subscribe(events.auth.signUp, this.sendWelcomeEmailOnceUserRegister);
+  }
+
+  /**
+   * Sends welcome email once the user register.
+   */
+  private sendWelcomeEmailOnceUserRegister = async (payload) => {
+    const { tenant, user } = payload;
+
+    // Send welcome mail to the user.
+    await this.agenda.now('welcome-email', {
+      organizationId: tenant.organizationId,
+      user,
+    });
+  };
+}
--- a/packages/server/src/utils/index.ts
+++ b/packages/server/src/utils/index.ts
@@ -419,58 +419,6 @@ export const parseDate = (date: string) => {
  return date ? moment(date).utcOffset(0).format('YYYY-MM-DD') : '';
 };

-const nestedArrayToFlatten = (
-  collection,
-  property = 'children',
-  parseItem = (a, level) => a,
-  level = 1
-) => {
-  const parseObject = (obj) =>
-    parseItem(
-      {
-        ..._.omit(obj, [property]),
-      },
-      level
-    );
-
-  return collection.reduce((items, currentValue, index) => {
-    let localItems = [...items];
-    const parsedItem = parseObject(currentValue, level);
-    localItems.push(parsedItem);
-
-    if (Array.isArray(currentValue[property])) {
-      const flattenArray = nestedArrayToFlatten(
-        currentValue[property],
-        property,
-        parseItem,
-        level + 1
-      );
-      localItems = _.concat(localItems, flattenArray);
-    }
-    return localItems;
-  }, []);
-};
-
-const assocDepthLevelToObjectTree = (
-  objects,
-  level = 1,
-  propertyName = 'level'
-) => {
-  for (let i = 0; i < objects.length; i++) {
-    const object = objects[i];
-    object[propertyName] = level;
-
-    if (object.children) {
-      assocDepthLevelToObjectTree(object.children, level + 1, propertyName);
-    }
-  }
-  return objects;
-};
-
-const castCommaListEnvVarToArray = (envVar: string): Array<string> => {
-  return envVar ? envVar?.split(',')?.map(_.trim) : [];
-};
-
 export {
  templateRender,
  accumSum,
@@ -501,7 +449,4 @@ export {
  dateRangeFromToCollection,
  transformToMapKeyValue,
  mergeObjectsBykey,
-  nestedArrayToFlatten,
-  assocDepthLevelToObjectTree,
-  castCommaListEnvVarToArray
 };
--- a/packages/server/views/mail/LicenseReceive.html
+++ b/packages/server/views/mail/LicenseReceive.html
@@ -0,0 +1,411 @@
+<!doctype html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Bigcapital | Reset your password</title>
+    <style>
+      /* -------------------------------------
+          GLOBAL RESETS
+      ------------------------------------- */
+      
+      /*All the styling goes here*/
+      
+      img {
+        border: none;
+        -ms-interpolation-mode: bicubic;
+        max-width: 100%; 
+      }
+
+      body {
+        background-color: #f6f6f6;
+        font-family: sans-serif;
+        -webkit-font-smoothing: antialiased;
+        font-size: 14px;
+        line-height: 1.4;
+        margin: 0;
+        padding: 0;
+        -ms-text-size-adjust: 100%;
+        -webkit-text-size-adjust: 100%; 
+      }
+
+      table {
+        border-collapse: separate;
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+        width: 100%; }
+        table td {
+          font-family: sans-serif;
+          font-size: 14px;
+          vertical-align: top; 
+      }
+
+      /* -------------------------------------
+          BODY & CONTAINER
+      ------------------------------------- */
+
+      .body {
+        background-color: #f6f6f6;
+        width: 100%; 
+      }
+
+      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
+      .container {
+        display: block;
+        margin: 0 auto !important;
+        /* makes it centered */
+        max-width: 580px;
+        padding: 10px;
+        width: 580px; 
+      }
+
+      /* This should also be a block element, so that it will fill 100% of the .container */
+      .content {
+        box-sizing: border-box;
+        display: block;
+        margin: 0 auto;
+        max-width: 580px;
+        padding: 10px; 
+      }
+
+      /* -------------------------------------
+          HEADER, FOOTER, MAIN
+      ------------------------------------- */
+      .main {
+        background: #ffffff;
+        border-radius: 3px;
+        width: 100%; 
+      }
+
+      .wrapper {
+        box-sizing: border-box;
+        padding: 20px; 
+      }
+
+      .content-block {
+        padding-bottom: 10px;
+        padding-top: 10px;
+      }
+
+      .footer {
+        clear: both;
+        margin-top: 10px;
+        text-align: center;
+        width: 100%; 
+      }
+        .footer td,
+        .footer p,
+        .footer span,
+        .footer a {
+          color: #999999;
+          font-size: 12px;
+          text-align: center; 
+      }
+
+      /* -------------------------------------
+          TYPOGRAPHY
+      ------------------------------------- */
+      h1,
+      h2,
+      h3,
+      h4 {
+        color: #000000;
+        font-family: sans-serif;
+        font-weight: bold;
+        line-height: 1.4;
+        margin: 0;
+        margin-bottom: 0; 
+      }
+
+      h1 {
+        font-size: 35px;
+        font-weight: 300;
+        text-align: center;
+        text-transform: capitalize; 
+      }
+
+      p,
+      ul,
+      ol {
+        font-family: sans-serif;
+        font-size: 14px;
+        font-weight: normal;
+        margin: 0;
+        margin-bottom: 15px; 
+      }
+        p li,
+        ul li,
+        ol li {
+          list-style-position: inside;
+          margin-left: 5px; 
+      }
+
+      a {
+        color: #3498db;
+        text-decoration: underline; 
+      }
+
+      /* -------------------------------------
+          BUTTONS
+      ------------------------------------- */
+      .btn {
+        box-sizing: border-box;
+        width: 100%;
+        
+      }
+        .btn > tbody > tr > td {
+          padding-bottom: 15px; }
+        .btn table {
+          width: auto; 
+      }
+        .btn table td {
+          background-color: #ffffff;
+          border-radius: 5px;
+          text-align: center; 
+      }
+        .btn a {
+          background-color: #ffffff;
+          border: solid 1px #3498db;
+          border-radius: 5px;
+          box-sizing: border-box;
+          color: #3498db;
+          cursor: pointer;
+          display: inline-block;
+          font-size: 14px;
+          font-weight: bold;
+          margin: 0;
+          padding: 12px 25px;
+          text-decoration: none;
+          text-transform: capitalize; 
+      }
+
+      .btn-primary table td {
+        background-color: #2d95fd; 
+      }
+
+      .btn-primary a {
+        background-color: #2d95fd;
+        border-color: #2d95fd;
+        color: #ffffff; 
+      }
+
+      /* -------------------------------------
+          OTHER STYLES THAT MIGHT BE USEFUL
+      ------------------------------------- */
+      .last {
+        margin-bottom: 0; 
+      }
+
+      .first {
+        margin-top: 0; 
+      }
+
+      .align-center {
+        text-align: center; 
+      }
+
+      .align-right {
+        text-align: right; 
+      }
+
+      .align-left {
+        text-align: left; 
+      }
+
+      .clear {
+        clear: both; 
+      }
+
+      .mt0 {
+        margin-top: 0; 
+      }
+
+      .mb0 {
+        margin-bottom: 0; 
+      }
+      
+      .mb4{
+        margin-bottom: 4rem;
+      }
+
+      .preheader {
+        color: transparent;
+        display: none;
+        height: 0;
+        max-height: 0;
+        max-width: 0;
+        opacity: 0;
+        overflow: hidden;
+        mso-hide: all;
+        visibility: hidden;
+        width: 0; 
+      }
+
+      .powered-by a {
+        text-decoration: none; 
+      }
+
+      hr {
+        border: 0;
+        border-bottom: 1px solid #f6f6f6;
+        margin: 20px 0; 
+      }
+
+      /* -------------------------------------
+          RESPONSIVE AND MOBILE FRIENDLY STYLES
+      ------------------------------------- */
+      @media only screen and (max-width: 620px) {
+        table[class=body] h1 {
+          font-size: 28px !important;
+          margin-bottom: 10px !important; 
+        }
+        table[class=body] p,
+        table[class=body] ul,
+        table[class=body] ol,
+        table[class=body] td,
+        table[class=body] span,
+        table[class=body] a {
+          font-size: 16px !important; 
+        }
+        table[class=body] .wrapper,
+        table[class=body] .article {
+          padding: 10px !important; 
+        }
+        table[class=body] .content {
+          padding: 0 !important; 
+        }
+        table[class=body] .container {
+          padding: 0 !important;
+          width: 100% !important; 
+        }
+        table[class=body] .main {
+          border-left-width: 0 !important;
+          border-radius: 0 !important;
+          border-right-width: 0 !important; 
+        }
+        table[class=body] .btn table {
+          width: 100% !important; 
+        }
+        table[class=body] .btn a {
+          width: 100% !important; 
+        }
+        table[class=body] .img-responsive {
+          height: auto !important;
+          max-width: 100% !important;
+          width: auto !important; 
+        }
+      }
+      
+      
+
+      /* -------------------------------------
+          PRESERVE THESE STYLES IN THE HEAD
+      ------------------------------------- */
+      @media all {
+        .ExternalClass {
+          width: 100%; 
+        }
+        .ExternalClass,
+        .ExternalClass p,
+        .ExternalClass span,
+        .ExternalClass font,
+        .ExternalClass td,
+        .ExternalClass div {
+          line-height: 100%; 
+        }
+        .apple-link a {
+          color: inherit !important;
+          font-family: inherit !important;
+          font-size: inherit !important;
+          font-weight: inherit !important;
+          line-height: inherit !important;
+          text-decoration: none !important; 
+        }
+        #MessageViewBody a {
+          color: inherit;
+          text-decoration: none;
+          font-size: inherit;
+          font-family: inherit;
+          font-weight: inherit;
+          line-height: inherit;
+        }
+        .btn-primary table td:hover {
+          background-color: #004dd0 !important; 
+        }
+        .btn-primary a:hover {
+          background-color: #004dd0 !important;
+          border-color: #004dd0 !important; 
+        } 
+      }
+      
+    
+      [data-icon="bigcapital"] path {
+        fill: #004dd0;
+      }
+
+      [data-icon='bigcapital'] .path-1,
+      [data-icon='bigcapital'] .path-13 {
+        fill: #2d95fd;
+      }
+    </style>
+  </head>
+  <body class="">
+    <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
+    <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body">
+      <tr>
+        <td>&nbsp;</td>
+        <td class="container">
+          <div class="content">
+
+            <!-- START CENTERED WHITE CONTAINER -->
+            <table role="presentation" class="main">
+              <!-- START MAIN CONTENT AREA -->
+              <tr>
+                <td class="wrapper">
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                    <tr>
+                      <td>
+                        <p class="align-center">
+                          <svg data-icon="bigcapital" class="bigcapital" width="190" height="37" viewBox="0 0 309.09 42.89"><desc>bigcapital</desc><path d="M56,3.16,61.33,8.5,31.94,37.9l-5.35-5.35Z" class="path-1" fill-rule="evenodd"></path><path d="M29.53,6.94l5.35,5.34L5.49,41.67.14,36.33l15.8-15.8Z" class="path-2" fill-rule="evenodd"></path><path d="M94.36,38.87H79.62v-31H94c6.33,0,10.22,3.15,10.22,8V16a7.22,7.22,0,0,1-4.07,6.69c3.58,1.37,5.8,3.45,5.8,7.61v.09C106,36,101.35,38.87,94.36,38.87Zm3.1-21.81c0-2-1.59-3.19-4.47-3.19H86.26v6.55h6.29c3,0,4.91-1,4.91-3.28Zm1.72,12.39c0-2.08-1.54-3.37-5-3.37H86.26V32.9h8.1c3,0,4.82-1.06,4.82-3.36Z" class="path-3" fill-rule="evenodd"></path><path d="M110.56,12.54v-6h7.08v6Zm.18,26.33V15.15h6.72V38.87Z" class="path-4" fill-rule="evenodd"></path><path d="M134,46a22.55,22.55,0,0,1-10.49-2.47l2.3-5a15.52,15.52,0,0,0,8,2.17c4.61,0,6.78-2.21,6.78-6.46V33.08c-2,2.39-4.16,3.85-7.75,3.85-5.53,0-10.53-4-10.53-11.07v-.09c0-7.08,5.09-11.06,10.53-11.06a9.63,9.63,0,0,1,7.66,3.54v-3.1h6.72V33.52C147.2,42.46,142.78,46,134,46Zm6.6-20.27a5.79,5.79,0,0,0-11.56,0v.09a5.42,5.42,0,0,0,5.76,5.49,5.49,5.49,0,0,0,5.8-5.49Z" class="path-5" fill-rule="evenodd"></path><path d="M164,39.41a12.11,12.11,0,0,1-12.35-12.26v-.09a12.18,12.18,0,0,1,12.44-12.35c4.47,0,7.25,1.5,9.47,4l-4.12,4.43a6.93,6.93,0,0,0-5.4-2.61c-3.36,0-5.75,3-5.75,6.46v.09c0,3.63,2.34,6.55,6,6.55,2.26,0,3.8-1,5.44-2.53l3.94,4A12,12,0,0,1,164,39.41Z" class="path-6" fill-rule="evenodd"></path><path d="M191.51,38.87V36.31a9.15,9.15,0,0,1-7.17,3c-4.47,0-8.15-2.57-8.15-7.26V32c0-5.18,3.94-7.57,9.56-7.57a16.74,16.74,0,0,1,5.8,1V25c0-2.79-1.72-4.34-5.09-4.34a17.57,17.57,0,0,0-6.55,1.28l-1.68-5.13a21,21,0,0,1,9.21-1.9c7.34,0,10.57,3.8,10.57,10.22V38.87Zm.13-9.55a10.3,10.3,0,0,0-4.29-.89c-2.88,0-4.65,1.15-4.65,3.27v.09c0,1.82,1.5,2.88,3.67,2.88,3.15,0,5.27-1.73,5.27-4.16Z" class="path-7" fill-rule="evenodd"></path><path d="M217.49,39.32a9.1,9.1,0,0,1-7.39-3.54V46h-6.73V15.15h6.73v3.41a8.7,8.7,0,0,1,7.39-3.85c5.53,0,10.8,4.34,10.8,12.26v.09C228.29,35,223.11,39.32,217.49,39.32ZM221.56,27c0-3.94-2.66-6.55-5.8-6.55S210,23,210,27v.09c0,3.94,2.61,6.55,5.75,6.55s5.8-2.57,5.8-6.55Z" class="path-8" fill-rule="evenodd"></path><path d="M232.93,12.54v-6H240v6Zm.18,26.33V15.15h6.73V38.87Z" class="path-9" fill-rule="evenodd"></path><path d="M253.73,39.27c-4.11,0-6.9-1.63-6.9-7.12V20.91H244V15.15h2.83V9.09h6.73v6.06h5.57v5.76h-5.57V31c0,1.55.66,2.3,2.16,2.3A6.84,6.84,0,0,0,259,32.5v5.4A9.9,9.9,0,0,1,253.73,39.27Z" class="path-10" fill-rule="evenodd"></path><path d="M277.55,38.87V36.31a9.15,9.15,0,0,1-7.18,3c-4.46,0-8.14-2.57-8.14-7.26V32c0-5.18,3.94-7.57,9.56-7.57a16.74,16.74,0,0,1,5.8,1V25c0-2.79-1.73-4.34-5.09-4.34A17.57,17.57,0,0,0,266,21.92l-1.68-5.13a20.94,20.94,0,0,1,9.2-1.9c7.35,0,10.58,3.8,10.58,10.22V38.87Zm.13-9.55a10.31,10.31,0,0,0-4.3-.89c-2.87,0-4.64,1.15-4.64,3.27v.09c0,1.82,1.5,2.88,3.67,2.88,3.14,0,5.27-1.73,5.27-4.16Z" class="path-11" fill-rule="evenodd"></path><path d="M289.72,38.87V6.57h6.72v32.3Z" class="path-12" fill-rule="evenodd"></path><path d="M302.06,38.87V31.79h7.17v7.08Z" class="path-13" fill-rule="evenodd"></path></svg>
+                        </p>
+                        
+                        <hr />
+                        
+                        <p class="align-center">
+                          <h3>License Code</h3>
+                        </p>
+                        <p class="mgb-1x">
+                          <h1>{{ licenseCode }}</h1>
+                        </p>
+                        <p class="email-note">
+                          This is an automatically generated email please do not reply to
+                          this email. If you face any issues, please contact us at <a href="mailto:{{ successEmail }}">{{ successEmail }}</a> or call <u>{{ successPhoneNumber }}</u></p>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+
+            <!-- END MAIN CONTENT AREA -->
+            </table>
+            <!-- END CENTERED WHITE CONTAINER -->
+
+            <!-- START FOOTER -->
+            <div class="footer">
+              <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td class="content-block powered-by">
+                    Powered by <a href="http://htmlemail.io">Bigcapital.com</a>.
+                  </td>
+                </tr>
+              </table>
+            </div>
+            <!-- END FOOTER -->
+
+          </div>
+        </td>
+        <td>&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>
--- a/packages/server/views/mail/ResetPassword.html
+++ b/packages/server/views/mail/ResetPassword.html
@@ -391,8 +391,10 @@
                            </tr>
                          </tbody>
                        </table>
-                        <p>If this was a mistake, just ignore this email and nothing will happen.</p>
-                        <p class="email-note">This is an automatically generated email please do not reply to this email.</p>
+                        <p>If you did not make this request, please contact us or ignore this message.</p>
+                        <p class="email-note">
+                          This is an automatically generated email please do not reply to
+                          this email. If you face any issues, please contact us at {{ contact_us_email }}</p>
                      </td>
                    </tr>
                  </table>
--- a/packages/server/views/mail/Welcome.html
+++ b/packages/server/views/mail/Welcome.html
@@ -0,0 +1,407 @@
+<!doctype html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Bigcapital | Reset your password</title>
+    <style>
+      /* -------------------------------------
+          GLOBAL RESETS
+      ------------------------------------- */
+      
+      img {
+        border: none;
+        -ms-interpolation-mode: bicubic;
+        max-width: 100%; 
+      }
+
+      body {
+        background-color: #f6f6f6;
+        font-family: sans-serif;
+        -webkit-font-smoothing: antialiased;
+        font-size: 14px;
+        line-height: 1.4;
+        margin: 0;
+        padding: 0;
+        -ms-text-size-adjust: 100%;
+        -webkit-text-size-adjust: 100%; 
+      }
+
+      table {
+        border-collapse: separate;
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+        width: 100%; }
+        table td {
+          font-family: sans-serif;
+          font-size: 14px;
+          vertical-align: top; 
+      }
+
+      /* -------------------------------------
+          BODY & CONTAINER
+      ------------------------------------- */
+
+      .body {
+        background-color: #f6f6f6;
+        width: 100%; 
+      }
+
+      /* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
+      .container {
+        display: block;
+        margin: 0 auto !important;
+        /* makes it centered */
+        max-width: 580px;
+        padding: 10px;
+        width: 580px; 
+      }
+
+      /* This should also be a block element, so that it will fill 100% of the .container */
+      .content {
+        box-sizing: border-box;
+        display: block;
+        margin: 0 auto;
+        max-width: 580px;
+        padding: 10px; 
+      }
+
+      /* -------------------------------------
+          HEADER, FOOTER, MAIN
+      ------------------------------------- */
+      .main {
+        background: #ffffff;
+        border-radius: 3px;
+        width: 100%; 
+      }
+
+      .wrapper {
+        box-sizing: border-box;
+        padding: 20px; 
+      }
+
+      .content-block {
+        padding-bottom: 10px;
+        padding-top: 10px;
+      }
+
+      .footer {
+        clear: both;
+        margin-top: 10px;
+        text-align: center;
+        width: 100%; 
+      }
+        .footer td,
+        .footer p,
+        .footer span,
+        .footer a {
+          color: #999999;
+          font-size: 12px;
+          text-align: center; 
+      }
+
+      /* -------------------------------------
+          TYPOGRAPHY
+      ------------------------------------- */
+      h1,
+      h2,
+      h3,
+      h4 {
+        color: #000000;
+        font-family: sans-serif;
+        font-weight: bold;
+        line-height: 1.4;
+        margin: 0;
+        margin-bottom: 0; 
+      }
+
+      h1 {
+        font-size: 35px;
+        font-weight: 300;
+        text-align: center;
+        text-transform: capitalize; 
+      }
+
+      p,
+      ul,
+      ol {
+        font-family: sans-serif;
+        font-size: 14px;
+        font-weight: normal;
+        margin: 0;
+        margin-bottom: 15px; 
+      }
+        p li,
+        ul li,
+        ol li {
+          list-style-position: inside;
+          margin-left: 5px; 
+      }
+
+      a {
+        color: #3498db;
+        text-decoration: underline; 
+      }
+
+      /* -------------------------------------
+          BUTTONS
+      ------------------------------------- */
+      .btn {
+        box-sizing: border-box;
+        width: 100%;
+        
+      }
+        .btn > tbody > tr > td {
+          padding-bottom: 15px; }
+        .btn table {
+          width: auto; 
+      }
+      .btn table td {
+          background-color: #ffffff;
+          border-radius: 5px;
+          text-align: center; 
+      }
+        .btn a {
+          background-color: #ffffff;
+          border: solid 1px #3498db;
+          border-radius: 5px;
+          box-sizing: border-box;
+          color: #3498db;
+          cursor: pointer;
+          display: inline-block;
+          font-size: 14px;
+          font-weight: bold;
+          margin: 0;
+          padding: 12px 25px;
+          text-decoration: none;
+          text-transform: capitalize; 
+      }
+
+      .btn-primary table td {
+        background-color: #2d95fd; 
+      }
+
+      .btn-primary a {
+        background-color: #2d95fd;
+        border-color: #2d95fd;
+        color: #ffffff; 
+      }
+
+      /* -------------------------------------
+          OTHER STYLES THAT MIGHT BE USEFUL
+      ------------------------------------- */
+      .last {
+        margin-bottom: 0; 
+      }
+
+      .first {
+        margin-top: 0; 
+      }
+
+      .align-center {
+        text-align: center; 
+      }
+
+      .align-right {
+        text-align: right; 
+      }
+
+      .align-left {
+        text-align: left; 
+      }
+
+      .clear {
+        clear: both; 
+      }
+
+      .mt0 {
+        margin-top: 0; 
+      }
+
+      .mb0 {
+        margin-bottom: 0; 
+      }
+      
+      .mb4{
+        margin-bottom: 4rem;
+      }
+
+      .preheader {
+        color: transparent;
+        display: none;
+        height: 0;
+        max-height: 0;
+        max-width: 0;
+        opacity: 0;
+        overflow: hidden;
+        mso-hide: all;
+        visibility: hidden;
+        width: 0; 
+      }
+
+      .powered-by a {
+        text-decoration: none; 
+      }
+
+      hr {
+        border: 0;
+        border-bottom: 1px solid #f6f6f6;
+        margin: 20px 0; 
+      }
+
+      /* -------------------------------------
+          RESPONSIVE AND MOBILE FRIENDLY STYLES
+      ------------------------------------- */
+      @media only screen and (max-width: 620px) {
+        table[class=body] h1 {
+          font-size: 28px !important;
+          margin-bottom: 10px !important; 
+        }
+        table[class=body] p,
+        table[class=body] ul,
+        table[class=body] ol,
+        table[class=body] td,
+        table[class=body] span,
+        table[class=body] a {
+          font-size: 16px !important; 
+        }
+        table[class=body] .wrapper,
+        table[class=body] .article {
+          padding: 10px !important; 
+        }
+        table[class=body] .content {
+          padding: 0 !important; 
+        }
+        table[class=body] .container {
+          padding: 0 !important;
+          width: 100% !important; 
+        }
+        table[class=body] .main {
+          border-left-width: 0 !important;
+          border-radius: 0 !important;
+          border-right-width: 0 !important; 
+        }
+        table[class=body] .btn table {
+          width: 100% !important; 
+        }
+        table[class=body] .btn a {
+          width: 100% !important; 
+        }
+        table[class=body] .img-responsive {
+          height: auto !important;
+          max-width: 100% !important;
+          width: auto !important; 
+        }
+      }
+      
+      
+
+      /* -------------------------------------
+          PRESERVE THESE STYLES IN THE HEAD
+      ------------------------------------- */
+      @media all {
+        .ExternalClass {
+          width: 100%; 
+        }
+        .ExternalClass,
+        .ExternalClass p,
+        .ExternalClass span,
+        .ExternalClass font,
+        .ExternalClass td,
+        .ExternalClass div {
+          line-height: 100%; 
+        }
+        .apple-link a {
+          color: inherit !important;
+          font-family: inherit !important;
+          font-size: inherit !important;
+          font-weight: inherit !important;
+          line-height: inherit !important;
+          text-decoration: none !important; 
+        }
+        #MessageViewBody a {
+          color: inherit;
+          text-decoration: none;
+          font-size: inherit;
+          font-family: inherit;
+          font-weight: inherit;
+          line-height: inherit;
+        }
+        .btn-primary table td:hover {
+          background-color: #004dd0 !important; 
+        }
+        .btn-primary a:hover {
+          background-color: #004dd0 !important;
+          border-color: #004dd0 !important; 
+        } 
+      }
+      [data-icon="bigcapital"] path {
+        fill: #004dd0;
+      }
+
+      [data-icon='bigcapital'] .path-1,
+      [data-icon='bigcapital'] .path-13 {
+        fill: #2d95fd;
+      }
+    </style>
+  </head>
+  <body class="">
+    <span class="preheader">This is preheader text. Some clients will show this text as a preview.</span>
+    <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body">
+      <tr>
+        <td>&nbsp;</td>
+        <td class="container">
+          <div class="content">
+
+            <!-- START CENTERED WHITE CONTAINER -->
+            <table role="presentation" class="main">
+              <!-- START MAIN CONTENT AREA -->
+              <tr>
+                <td class="wrapper">
+                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                    <tr>
+                      <td>
+                        <p class="align-center">
+                          <img src="cid:bigcapital_logo" />
+                        </p>
+                        <hr />
+                        
+                        <p class="align-center">
+                          <h3>Hi {{ firstName }}, Welcome to Bigcapital, </h3>
+                        </p>
+
+                        <p class="mgb-1x">
+                          Your organization Id: <strong>{{ organizationId }}</strong>
+                        </p>
+                        <p class="mgb-1x">We are available to help you get started and answer any questions you may have. You can also email <a href="mailto:{{ successEmail }}">{{ successEmail }}</a> or call <u>{{ successPhoneNumber }}</u> about your set-up questions.</p>
+
+                        <p class="mgb-2-5x">Thank you for trusting Bigcapital Software for your business needs. We look forward to serving you!</p>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+
+            <!-- END MAIN CONTENT AREA -->
+            </table>
+            <!-- END CENTERED WHITE CONTAINER -->
+
+            <!-- START FOOTER -->
+            <div class="footer">
+              <table role="presentation" border="0" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td class="content-block powered-by">
+                    Made by Bigcapital Technologies, Inc
+                  </td>
+                </tr>
+              </table>
+            </div>
+            <!-- END FOOTER -->
+
+          </div>
+        </td>
+        <td>&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>
--- a/packages/webapp/Dockerfile
+++ b/packages/webapp/Dockerfile
@@ -5,10 +5,10 @@ USER root
 WORKDIR /app

 # Install dependencies
-COPY package*.json ./
+COPY package.json ./
 COPY lerna.json ./

-COPY ./packages/webapp/package*.json /app/packages/webapp/
+COPY ./packages/webapp/package.json /app/packages/webapp/package.json

 RUN npm install
 RUN npm run bootstrap
--- a/packages/webapp/craco.config.js
+++ b/packages/webapp/craco.config.js
@@ -1,18 +1,7 @@
 const path = require('path');
-const webpack = require('webpack');
-const dotenv = require('dotenv-webpack');

 module.exports = {
  webpack: {
-    plugins: [
-      new dotenv(),
-      new webpack.DefinePlugin({
-        'process.env': {
-          MONOREPO_VERSION: JSON.stringify(require('../../lerna.json').version),
-        },
-      }),
-    ],
-
    alias: {
      '@': path.resolve(__dirname, 'src'),
    },
--- a/packages/webapp/package-lock.json
+++ b/packages/webapp/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@bigcapital/webapp",
-  "version": "0.9.6",
+  "version": "1.7.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1205,9 +1205,9 @@
      }
    },
    "@blueprintjs-formik/core": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/core/-/core-0.3.4.tgz",
-      "integrity": "sha512-gksuBYXXvX7IhZXbPEFEAHgmJWp1vt/GTMW0GYBkCoGBAvXy08hIHjMc85M0WNyen+tic3NRas6I2wsjgokgqw==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/core/-/core-0.2.1.tgz",
+      "integrity": "sha512-YGJe+QorDGbkWDSUg6x69LYGN62Kgvb92Iz/voqmszVRKj4KcoPvd/7coF8Jmu+ZQE6LcwM/9ccB2i63L99ITA==",
      "requires": {
        "lodash.get": "^4.4.2",
        "lodash.keyby": "^4.6.0",
@@ -1227,9 +1227,9 @@
      }
    },
    "@blueprintjs-formik/select": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/select/-/select-0.2.5.tgz",
-      "integrity": "sha512-Sztf5dOemedUBfEjnDWD8ryfMU/x95hyhIgJT5/ywC/jQfX+d/K2OhujklTrCDzQilUeAJLoVkSdV+w77n8ckQ==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/select/-/select-0.1.5.tgz",
+      "integrity": "sha512-EqGbuoiS1VrWpzjd39uVhBAmfVobdpgqalGcpODyGA+XAYoft1UU12yzTzrEOwBZpQKiC12UQwekUPspYBsVKA==",
      "requires": {
        "lodash.get": "^4.4.2",
        "lodash.keyby": "^4.6.0",
@@ -1929,6 +1929,137 @@
        "reselect": "^4.1.7"
      }
    },
+    "@sentry/browser": {
+      "version": "6.19.7",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.19.7.tgz",
+      "integrity": "sha512-oDbklp4O3MtAM4mtuwyZLrgO1qDVYIujzNJQzXmi9YzymJCuzMLSRDvhY83NNDCRxf0pds4DShgYeZdbSyKraA==",
+      "requires": {
+        "@sentry/core": "6.19.7",
+        "@sentry/types": "6.19.7",
+        "@sentry/utils": "6.19.7",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@sentry/core": {
+      "version": "6.19.7",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.19.7.tgz",
+      "integrity": "sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==",
+      "requires": {
+        "@sentry/hub": "6.19.7",
+        "@sentry/minimal": "6.19.7",
+        "@sentry/types": "6.19.7",
+        "@sentry/utils": "6.19.7",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@sentry/hub": {
+      "version": "6.19.7",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.19.7.tgz",
+      "integrity": "sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA==",
+      "requires": {
+        "@sentry/types": "6.19.7",
+        "@sentry/utils": "6.19.7",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@sentry/minimal": {
+      "version": "6.19.7",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.19.7.tgz",
+      "integrity": "sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ==",
+      "requires": {
+        "@sentry/hub": "6.19.7",
+        "@sentry/types": "6.19.7",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@sentry/react": {
+      "version": "6.19.7",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-6.19.7.tgz",
+      "integrity": "sha512-VzJeBg/v41jfxUYPkH2WYrKjWc4YiMLzDX0f4Zf6WkJ4v3IlDDSkX6DfmWekjTKBho6wiMkSNy2hJ1dHfGZ9jA==",
+      "requires": {
+        "@sentry/browser": "6.19.7",
+        "@sentry/minimal": "6.19.7",
+        "@sentry/types": "6.19.7",
+        "@sentry/utils": "6.19.7",
+        "hoist-non-react-statics": "^3.3.2",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@sentry/tracing": {
+      "version": "6.19.7",
+      "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.19.7.tgz",
+      "integrity": "sha512-ol4TupNnv9Zd+bZei7B6Ygnr9N3Gp1PUrNI761QSlHtPC25xXC5ssSD3GMhBgyQrcvpuRcCFHVNNM97tN5cZiA==",
+      "requires": {
+        "@sentry/hub": "6.19.7",
+        "@sentry/minimal": "6.19.7",
+        "@sentry/types": "6.19.7",
+        "@sentry/utils": "6.19.7",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
+    "@sentry/types": {
+      "version": "6.19.7",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.19.7.tgz",
+      "integrity": "sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="
+    },
+    "@sentry/utils": {
+      "version": "6.19.7",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.19.7.tgz",
+      "integrity": "sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA==",
+      "requires": {
+        "@sentry/types": "6.19.7",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
    "@sheerun/mutationobserver-shim": {
      "version": "0.3.3",
      "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
@@ -5854,27 +5985,11 @@
      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
    },
-    "dotenv-defaults": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dotenv-defaults/-/dotenv-defaults-2.0.2.tgz",
-      "integrity": "sha512-iOIzovWfsUHU91L5i8bJce3NYK5JXeAwH50Jh6+ARUdLiiGlYWfGw6UkzsYqaXZH/hjE/eCd/PlfM/qqyK0AMg==",
-      "requires": {
-        "dotenv": "^8.2.0"
-      }
-    },
    "dotenv-expand": {
      "version": "5.1.0",
      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
    },
-    "dotenv-webpack": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv-webpack/-/dotenv-webpack-8.0.1.tgz",
-      "integrity": "sha512-CdrgfhZOnx4uB18SgaoP9XHRN2v48BbjuXQsZY5ixs5A8579NxQkmMxRtI7aTwSiSQcM2ao12Fdu+L3ZS3bG4w==",
-      "requires": {
-        "dotenv-defaults": "^2.0.2"
-      }
-    },
    "duplexer": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -7183,11 +7298,6 @@
        "locate-path": "^3.0.0"
      }
    },
-    "flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="
-    },
    "flat-cache": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
@@ -17751,4 +17861,4 @@
      "integrity": "sha512-7UlRWU4Q3uCMCeDVMOm7eBrIu145OqsIJ3p6zq58l8UsSYwKWxc6zEapC5YA9tIeh0oheb4cT9Kk2Wq353loFg=="
    }
  }
-}
+}
--- a/packages/webapp/package.json
+++ b/packages/webapp/package.json
@@ -1,11 +1,11 @@
 {
  "name": "@bigcapital/webapp",
-  "version": "0.9.6",
+  "version": "1.7.1",
  "private": true,
  "dependencies": {
-    "@blueprintjs-formik/core": "^0.3.4",
+    "@blueprintjs-formik/core": "^0.2.1",
    "@blueprintjs-formik/datetime": "^0.3.4",
-    "@blueprintjs-formik/select": "^0.2.5",
+    "@blueprintjs-formik/select": "^0.1.4",
    "@blueprintjs/core": "^3.50.2",
    "@blueprintjs/datetime": "^3.23.12",
    "@blueprintjs/popover2": "^0.11.1",
@@ -16,6 +16,8 @@
    "@casl/react": "^2.3.0",
    "@craco/craco": "^5.9.0",
    "@reduxjs/toolkit": "^1.2.5",
+    "@sentry/react": "^6.13.2",
+    "@sentry/tracing": "^6.13.2",
    "@testing-library/jest-dom": "^4.2.4",
    "@testing-library/react": "^9.4.0",
    "@testing-library/user-event": "^7.2.1",
@@ -42,9 +44,7 @@
    "deep-map-keys": "^2.0.1",
    "deepdash": "^5.3.9",
    "dependency-graph": "^0.11.0",
-    "dotenv-webpack": "^8.0.1",
    "fast-deep-equal": "^3.1.3",
-    "flat": "^5.0.2",
    "formik": "^2.2.5",
    "http-proxy-middleware": "^1.0.0",
    "jest": "24.9.0",
--- a/packages/webapp/public/icons/flags/AD.svg
+++ b/packages/webapp/public/icons/flags/AD.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="15px" viewBox="0 0 21 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 46 (44423) - http://www.bohemiancoding.com/sketch -->
+    <title>AD</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#F0F0F0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#1537D1" offset="0%"></stop>
+            <stop stop-color="#0522A5" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
+            <stop stop-color="#EA3058" offset="0%"></stop>
+            <stop stop-color="#CE173E" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-4">
+            <stop stop-color="#FFCF3C" offset="0%"></stop>
+            <stop stop-color="#FECB2F" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="AD">
+            <rect id="FlagBackground" fill="url(#linearGradient-1)" x="0" y="0" width="21" height="15"></rect>
+            <rect id="Mask-Copy" fill="url(#linearGradient-2)" x="0" y="0" width="21" height="15"></rect>
+            <rect id="Mask" fill="url(#linearGradient-3)" x="10" y="0" width="11" height="15"></rect>
+            <rect id="Rectangle-2" fill="url(#linearGradient-4)" x="7" y="0" width="7" height="15"></rect>
+            <polygon id="Rectangle-139-Copy" fill="#FFEDB1" points="9.5 6.5 10.5 6.5 10.5 7 9.5 7"></polygon>
+            <path d="M9.6650265,7.9595207 C9.68963036,8.25476702 9.9569379,8.5 10.2524408,8.5 L10.7475592,8.5 C11.042238,8.5 11.3105295,8.2528489 11.3349735,7.9595207 L11.4566002,6.5 L9.54339977,6.5 L9.6650265,7.9595207 Z M9.04128242,6.49538898 C9.01848277,6.2217932 9.2157526,6 9.49538898,6 L11.504611,6 C11.7782068,6 11.9820206,6.2157526 11.9587176,6.49538898 L11.8332464,8.00104344 C11.7872707,8.55275191 11.3030501,9 10.7475592,9 L10.2524408,9 C9.69880801,9 9.21311164,8.55733967 9.16675362,8.00104344 L9.04128242,6.49538898 Z" id="Rectangle-137" fill="#D32E28" fill-rule="nonzero"></path>
+            <polygon id="Rectangle-139" fill="#D32E28" points="9.5 7 11.5 7 11.5 7.5 11 7.5 10 7.5 9.5 7.5"></polygon>
+        </g>
+    </g>
+</svg>
--- a/packages/webapp/public/icons/currency-flags/AED.svg
+++ b/packages/webapp/public/icons/currency-flags/AED.svg
--- a/packages/webapp/public/icons/currency-flags/AFN.svg
+++ b/packages/webapp/public/icons/currency-flags/AFN.svg
--- a/packages/webapp/public/icons/flags/AG.svg
+++ b/packages/webapp/public/icons/flags/AG.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="15px" viewBox="0 0 21 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 46 (44423) - http://www.bohemiancoding.com/sketch -->
+    <title>AG</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#F0F0F0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#E2243B" offset="0%"></stop>
+            <stop stop-color="#CC162C" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
+            <stop stop-color="#262626" offset="0%"></stop>
+            <stop stop-color="#0D0D0D" offset="100%"></stop>
+        </linearGradient>
+        <polygon id="path-4" points="0 0 21 0 10.5 15"></polygon>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-6">
+            <stop stop-color="#FFCF3C" offset="0%"></stop>
+            <stop stop-color="#FECB2F" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-7">
+            <stop stop-color="#1984D8" offset="0%"></stop>
+            <stop stop-color="#1175C4" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="AG">
+            <rect id="FlagBackground" fill="url(#linearGradient-1)" x="0" y="0" width="21" height="15"></rect>
+            <path d="M8.5,7 C8.5,7.73933629 8.90117129,8.38497401 9.49770903,8.73110833 M11.576137,8.68609748 C12.1317007,8.33077576 12.5,7.70839833 12.5,7" id="Oval-5" opacity="0.75"></path>
+            <ellipse id="Oval-5" fill-opacity="0.5" fill="#FFFFFF" cx="10.5" cy="6.5" rx="1" ry="1.5"></ellipse>
+            <rect id="Mask-Copy" fill="url(#linearGradient-2)" x="0" y="0" width="21" height="15"></rect>
+            <mask id="mask-5" fill="white">
+                <use xlink:href="#path-4"></use>
+            </mask>
+            <use id="Mask" fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
+            <polygon id="Star-1" fill="url(#linearGradient-6)" mask="url(#mask-5)" points="10.5 8.25 8.77792455 10.1574579 8.90900974 7.59099026 6.3425421 7.72207545 8.25 6 5.99999999 3.99999993 8.90900963 4.49999993 8.49999999 1.49999999 10.5 3.99999993 12.5 1.49999999 12.0909905 4.49999993 15 4 12.75 6 14.6574579 7.72207545 12.0909903 7.59099026 12.2220754 10.1574579"></polygon>
+            <rect id="Rectangle-2" fill="url(#linearGradient-7)" mask="url(#mask-5)" x="0" y="6" width="21" height="4"></rect>
+            <rect id="Rectangle-2" fill="url(#linearGradient-1)" mask="url(#mask-5)" x="0" y="10" width="21" height="5"></rect>
+        </g>
+    </g>
+</svg>
--- a/packages/webapp/public/icons/flags/AI.svg
+++ b/packages/webapp/public/icons/flags/AI.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="15px" viewBox="0 0 21 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 46 (44423) - http://www.bohemiancoding.com/sketch -->
+    <title>AI</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#F0F0F0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#0A17A7" offset="0%"></stop>
+            <stop stop-color="#030E88" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
+            <stop stop-color="#DB1E36" offset="0%"></stop>
+            <stop stop-color="#D51931" offset="100%"></stop>
+        </linearGradient>
+        <path d="M0,2.5 L0,0 L1,0.5 L2,0 L3,0.5 L4,0 L4,2.5 C4,4 2,5 2,5 C2,5 0,4 0,2.5 Z" id="path-4"></path>
+        <filter x="-6.2%" y="-5.0%" width="112.5%" height="120.0%" filterUnits="objectBoundingBox" id="filter-6">
+            <feOffset dx="0" dy="0.5" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.06 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
+        </filter>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-7">
+            <stop stop-color="#FFA51B" offset="0%"></stop>
+            <stop stop-color="#FF9A00" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="AI">
+            <rect id="FlagBackground" fill="url(#linearGradient-1)" x="0" y="0" width="21" height="15"></rect>
+            <rect id="Mask-Copy" fill="url(#linearGradient-2)" x="0" y="0" width="21" height="15"></rect>
+            <path d="M3,3.22996746 L-1.3516287,-0.5 L0.660232527,-0.5 L4.16023253,2 L4.85660189,2 L9.5,-0.902123821 L9.5,0.25 C9.5,0.552509227 9.33308555,0.876533554 9.08215972,1.05576629 L6,3.25730895 L6,3.77003254 L9.13722049,6.45907867 C9.59934261,6.85518335 9.34102897,7.5 8.75,7.5 C8.50478614,7.5 8.2052751,7.40393402 8.00092153,7.25796718 L4.83976747,5 L4.14339811,5 L-0.5,7.90212382 L-0.5,6.24269105 L3,3.74269105 L3,3.22996746 Z" id="Rectangle-36" fill="url(#linearGradient-1)" fill-rule="nonzero"></path>
+            <path d="M3.5,3 L-4.4408921e-16,7.10542736e-15 L0.5,7.10542736e-15 L4,2.5 L5,2.5 L9,7.10542736e-15 L9,0.25 C9,0.388071187 8.91348267,0.561798096 8.79154062,0.648899555 L5.5,3 L5.5,4 L8.8118248,6.83870697 C8.91575109,6.92778665 8.8840332,7 8.75,7 L8.75,7 C8.61192881,7 8.41348267,6.9382019 8.29154062,6.85110044 L5,4.5 L4,4.5 L-4.4408921e-16,7 L-4.4408921e-16,6.5 L3.5,4 L3.5,3 Z" id="Rectangle-36" fill="url(#linearGradient-3)"></path>
+            <path d="M-4.4408921e-16,2.5 L-4.4408921e-16,4.5 L3.5,4.5 L3.5,7.00461102 C3.5,7.2782068 3.71403503,7.5 4.00468445,7.5 L4.99531555,7.5 C5.27404508,7.5 5.5,7.2842474 5.5,7.00461102 L5.5,4.5 L9.00952148,4.5 C9.28040529,4.5 9.5,4.28596497 9.5,3.99531555 L9.5,3.00468445 C9.5,2.72595492 9.28494263,2.5 9.00952148,2.5 L5.5,2.5 L5.5,7.10542736e-15 L3.5,7.10542736e-15 L3.5,2.5 L-4.4408921e-16,2.5 Z" id="Rectangle-2" fill="url(#linearGradient-1)"></path>
+            <polygon id="Rectangle-36" fill="url(#linearGradient-3)" points="-4.4408921e-16 3 4 3 4 2.5 4 7.10542736e-15 5 7.10542736e-15 5 2.5 5 3 9 3 9 4 5 4 5 4.5 5 7 4 7 4 4.5 4 4 -4.4408921e-16 4"></polygon>
+            <g id="Rectangle-1105" transform="translate(13.000000, 5.000000)">
+                <mask id="mask-5" fill="white">
+                    <use xlink:href="#path-4"></use>
+                </mask>
+                <g id="Mask">
+                    <use fill="black" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-4"></use>
+                    <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-4"></use>
+                </g>
+                <rect id="Rectangle-1106" fill="#9ACCFF" mask="url(#mask-5)" x="0" y="4" width="4" height="1"></rect>
+                <path d="M2,2 C1.72385763,2 1.5,1.77614237 1.5,1.5 C1.5,1.22385763 1.72385763,1 2,1 C2.27614237,1 2.5,1.22385763 2.5,1.5 C2.5,1.77614237 2.27614237,2 2,2 Z M1,3 C0.723857625,3 0.5,2.77614237 0.5,2.5 C0.5,2.22385763 0.723857625,2 1,2 C1.27614237,2 1.5,2.22385763 1.5,2.5 C1.5,2.77614237 1.27614237,3 1,3 Z M3,3 C2.72385763,3 2.5,2.77614237 2.5,2.5 C2.5,2.22385763 2.72385763,2 3,2 C3.27614237,2 3.5,2.22385763 3.5,2.5 C3.5,2.77614237 3.27614237,3 3,3 Z" id="Oval-170" fill="url(#linearGradient-7)" mask="url(#mask-5)"></path>
+            </g>
+        </g>
+    </g>
+</svg>
--- a/packages/webapp/public/icons/currency-flags/ALL.svg
+++ b/packages/webapp/public/icons/currency-flags/ALL.svg
--- a/packages/webapp/public/icons/currency-flags/AMD.svg
+++ b/packages/webapp/public/icons/currency-flags/AMD.svg
--- a/packages/webapp/public/icons/currency-flags/AOA.svg
+++ b/packages/webapp/public/icons/currency-flags/AOA.svg
--- a/packages/webapp/public/icons/currency-flags/ARS.svg
+++ b/packages/webapp/public/icons/currency-flags/ARS.svg
--- a/packages/webapp/public/icons/flags/AS.svg
+++ b/packages/webapp/public/icons/flags/AS.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="15px" viewBox="0 0 21 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 46 (44423) - http://www.bohemiancoding.com/sketch -->
+    <title>AS</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#F0F0F0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#071585" offset="0%"></stop>
+            <stop stop-color="#000B64" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
+            <stop stop-color="#D32636" offset="0%"></stop>
+            <stop stop-color="#BA1827" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="35.4001096%" y2="89.1313033%" id="linearGradient-4">
+            <stop stop-color="#AB5423" offset="0%"></stop>
+            <stop stop-color="#5A3719" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="AS">
+            <rect id="FlagBackground" fill="url(#linearGradient-1)" x="0" y="0" width="21" height="15"></rect>
+            <rect id="Mask" fill="url(#linearGradient-2)" x="0" y="0" width="21" height="15"></rect>
+            <polygon id="Rectangle-1134" fill="url(#linearGradient-3)" fill-rule="nonzero" points="22 15.5 0 7.5 22 -0.5"></polygon>
+            <polygon id="Rectangle-1134" fill="url(#linearGradient-1)" fill-rule="nonzero" points="21 0.927699992 2.92617498 7.5 21 14.0723"></polygon>
+            <path d="M16,7.038486 C15.8815511,6.92003711 15.1942139,7.19421386 15.1942139,7.19421386 L14,6 C14,6 13.9383569,5.33698587 14.5,5 C14.9247187,4.74516878 15.7204931,4.83977815 16.4990013,4.5 C17.7459982,3.95575102 19,3 19,3 L18.1979642,5.20559849 C18.1979642,5.20559849 19.1166408,5.67923724 18.9999998,6 C18.9661979,6.0929551 18.0694389,6.38457486 17.9999998,6.5 C17.8680615,6.71931452 18.5239661,6.78580715 18.3197925,7.03848593 C17.7327784,7.76495606 17,8.5 17,8.5 L16,8 C16,8 16.1501465,7.18863249 16,7.038486 Z" id="Rectangle-1475" fill="url(#linearGradient-4)"></path>
+            <circle id="Oval-322" fill="#FFC322" cx="13.5" cy="7.5" r="1"></circle>
+            <path d="M12.5,9 L17.5,9 C17.7761424,9 18,8.77614237 18,8.5 C18,8.22385763 17.7761424,8 17.5,8 L12.5,8 C12.2238576,8 12,8.22385763 12,8.5 C12,8.77614237 12.2238576,9 12.5,9 Z" id="Line" fill="#FFC322" fill-rule="nonzero"></path>
+            <path d="M14.1969596,10.4595725 L17.6969596,8.95957252 C17.9507745,8.8507947 18.0683503,8.55685524 17.9595725,8.30304035 C17.8507947,8.04922546 17.5568552,7.93164967 17.3030404,8.04042748 L13.8030404,9.54042748 C13.5492255,9.6492053 13.4316497,9.94314476 13.5404275,10.1969596 C13.6492053,10.4507745 13.9431448,10.5683503 14.1969596,10.4595725 Z" id="Line-Copy" fill="#FFC322" fill-rule="nonzero"></path>
+        </g>
+    </g>
+</svg>
--- a/packages/webapp/public/icons/flags/AT.svg
+++ b/packages/webapp/public/icons/flags/AT.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="21px" height="15px" viewBox="0 0 21 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: sketchtool 46 (44423) - http://www.bohemiancoding.com/sketch -->
+    <title>AT</title>
+    <desc>Created with sketchtool.</desc>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#FFFFFF" offset="0%"></stop>
+            <stop stop-color="#F0F0F0" offset="100%"></stop>
+        </linearGradient>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-2">
+            <stop stop-color="#F64253" offset="0%"></stop>
+            <stop stop-color="#EA2D3F" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="AT">
+            <rect id="FlagBackground" fill="url(#linearGradient-1)" x="0" y="0" width="21" height="15"></rect>
+            <rect id="Rectangle-2" fill="url(#linearGradient-2)" x="0" y="0" width="21" height="5"></rect>
+            <rect id="Rectangle-2" fill="url(#linearGradient-2)" x="0" y="10" width="21" height="5"></rect>
+            <rect id="Rectangle-2" fill="url(#linearGradient-1)" x="0" y="5" width="21" height="5"></rect>
+        </g>
+    </g>
+</svg>
--- a/packages/webapp/public/icons/currency-flags/AUD.svg
+++ b/packages/webapp/public/icons/currency-flags/AUD.svg
--- a/packages/webapp/public/icons/currency-flags/AWG.svg
+++ b/packages/webapp/public/icons/currency-flags/AWG.svg
--- a/Show More
+++ b/Show More