chore: update mysql docker container restart policy

fix(webapp): show loading message of cost computing job on financial reports

.all-contributorsrc

@@ -0,0 +1,53 @@
+{
+  "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"
+}

.env.example

@@ -29,7 +29,7 @@ TENANT_DB_NAME_PERFIX=bigcapital_tenant_
 # TENANT_DB_CHARSET=
 
 # Application
-BASE_URL=https://bigcapital.ly
+BASE_URL=http://example.com
 JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
 
 # Jobs MongoDB

CHANGELOG.md

@@ -2,6 +2,42 @@
 
 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`

README.md

@@ -47,3 +47,38 @@ Bigcapital is a smart and open-source accounting and inventory software, Bigcapi
 # Changelog
 
 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!

docker-compose.prod.yml

@@ -21,10 +21,16 @@ services:
     depends_on:
       - server
       - webapp
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
   webapp:
     container_name: bigcapital-webapp
     image: ghcr.io/bigcapitalhq/webapp:latest
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
   server:
     container_name: bigcapital-server
@@ -37,6 +43,9 @@ services:
       - mysql
       - mongo
       - redis
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     environment:
       # Mail
       - MAIL_HOST=${MAIL_HOST}
@@ -93,6 +102,9 @@ services:
 
   mysql:
     container_name: bigcapital-mysql
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     build:
       context: ./docker/mariadb
     environment:
@@ -106,7 +118,10 @@ services:
       - '3306'
 
   mongo:
-    container_name: bigcapital-mongo 
+    container_name: bigcapital-mongo
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     build: ./docker/mongo
     expose:
       - '27017'
@@ -115,6 +130,9 @@ services:
 
   redis:
     container_name: bigcapital-redis
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     build:
       context: ./docker/redis
     expose:

docker-compose.yml

@@ -20,6 +20,9 @@ services:
       - '3306'
     ports:
       - '3306:3306'
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
   mongo:
     build: ./docker/mongo
@@ -29,6 +32,9 @@ services:
       - mongo:/var/lib/mongodb
     ports:
       - '27017:27017'
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
   redis:
     build:
@@ -37,6 +43,9 @@ services:
       - "6379"
     volumes:
       - redis:/data
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
 # Volumes
 volumes:

e2e/_utils.ts

@@ -0,0 +1,13 @@
+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',
+    },
+  };
+};

e2e/authentication.spec.ts

@@ -1,14 +1,23 @@
 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();
+    authPage = await browser.newPage({ ...defaultPageConfig() });
+  });
+  test.afterAll(async () => {
+    await authPage.close();
+  });
+  test.afterEach(async ({ context }) => {
+    context.clearCookies();
+    await clearLocalStorage(authPage);
   });
 
   test.describe('login', () => {
-    test.beforeAll(async () => {
+    test.beforeEach(async () => {
       await authPage.goto('/auth/login');
     });
     test('should show the login page.', async () => {
@@ -30,10 +39,23 @@ 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.beforeAll(async () => {
+    test.beforeEach(async () => {
       await authPage.goto('/auth/register');
     });
     test('should first name, last name, email and password be required.', async () => {
@@ -52,10 +74,36 @@ 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 () => {
+    test.beforeAll(async ({ browser }) => {
+      authPage = await browser.newPage({ ...defaultPageConfig() });
+    });
+    test.afterAll(async () => {
+      await authPage.close();
+    });
+    test.beforeEach(async () => {
       await authPage.goto('/auth/send_reset_password');
     });
     test('should email be required.', async () => {

e2e/onboarding.spec.ts

@@ -0,0 +1,86 @@
+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);
+    });
+  });
+});

package-lock.json

@@ -333,6 +333,12 @@
         "@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",
@@ -945,6 +951,7 @@
       "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",
@@ -954,7 +961,8 @@
         "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=="
+          "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg==",
+          "dev": true
         }
       }
     },
@@ -1003,7 +1011,8 @@
     "@types/node": {
       "version": "18.14.6",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz",
-      "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="
+      "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==",
+      "dev": true
     },
     "@types/normalize-package-data": {
       "version": "2.4.1",
@@ -2324,6 +2333,7 @@
       "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": {

package.json

@@ -18,12 +18,13 @@
     "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"

packages/server/src/api/controllers/Authentication.ts

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

packages/server/src/config/index.ts

@@ -95,16 +95,15 @@ 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 +136,6 @@ module.exports = {
     },
   },
 
-  /**
-   * Users registeration configuration.
-   */
-  registration: {
-    countries: {
-      whitelist: ['LY'],
-      blacklist: [],
-    },
-  },
-
   /**
    * Sign-up restrictions
    */
@@ -167,8 +156,6 @@ module.exports = {
     browserWSEndpoint: process.env.BROWSER_WS_ENDPOINT,
   },
 
-  protocol: '',
-  hostname: '',
   scheduleComputeItemCost: 'in 5 seconds',
 
   /**

packages/server/src/interfaces/Ledger.ts

@@ -41,6 +41,8 @@ export interface ILedgerEntry {
   index: number;
   indexGroup?: number;
 
+  note?: string;
+
   userId?: number;
   itemId?: number;
   branchId?: number;

packages/server/src/jobs/ResetPasswordMail.ts

@@ -1,38 +1,34 @@
-import { Container, Inject } from 'typedi';
+import { Container } from 'typedi';
-import AuthenticationService from '@/services/Authentication/AuthApplication';
+import AuthenticationMailMesssages from '@/services/Authentication/AuthenticationMailMessages';
 
-export default class WelcomeEmailJob {
+export default class ResetPasswordEmailJob {
   /**
    * 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 {Job} job
-   * @param {Function} done 
+   * @param {Function} done
    */
   public async handler(job, done: Function): Promise<void> {
     const { data } = job.attrs;
     const { user, token } = data;
-    const Logger = Container.get('logger');
+    const authService = Container.get(AuthenticationMailMesssages);
-    const authService = Container.get(AuthenticationService);
 
-    Logger.info(`[send_reset_password] started.`, { data });
-  
     try {
-      await authService.mailMessages.sendResetPasswordMessage(user, token);
+      await authService.sendResetPasswordMessage(user, token);
-      Logger.info(`[send_reset_password] finished.`, { data });
+      done();
-      done()
     } catch (error) {
-      Logger.error(`[send_reset_password] error.`, { data, error });
+      console.log(error);
       done(error);
     }
   }

packages/server/src/jobs/SmsNotification.ts

@@ -1,22 +0,0 @@
-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);
-    }
-  }
-}

packages/server/src/jobs/WelcomeSMS.ts

@@ -1,35 +0,0 @@
-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);
-    }
-  }
-}

packages/server/src/jobs/welcomeEmail.ts

@@ -1,39 +0,0 @@
-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);
-    }
-  }
-}

packages/server/src/loaders/eventEmitter.ts

@@ -31,7 +31,6 @@ 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';
@@ -120,7 +119,6 @@ export const susbcribers = () => {
     PurgeUserAbilityCache,
     ResetLoginThrottleSubscriber,
     AuthenticationSubscriber,
-    AuthSendWelcomeMailSubscriber,
     PurgeAuthorizedUserOnceRoleMutate,
     SendSmsNotificationToCustomer,
     SendSmsNotificationSaleReceipt,

packages/server/src/loaders/jobs.ts

@@ -1,24 +1,18 @@
 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();
 };

packages/server/src/services/Accounting/utils.ts

@@ -21,6 +21,8 @@ export const transformLedgerEntryToTransaction = (
     transactionNumber: entry.transactionNumber,
     referenceNumber: entry.referenceNumber,
 
+    note: entry.note,
+
     index: entry.index,
     indexGroup: entry.indexGroup,
 

packages/server/src/services/Authentication/AuthenticationMailMessages.ts

@@ -5,59 +5,24 @@ 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>}
    */
-  async sendResetPasswordMessage(
+  public async sendResetPasswordMessage(
     user: ISystemUser,
     token: string
   ): Promise<void> {
-    const root = __dirname + '/../../../views/images/bigcapital.png';
+    await new Mail()
-
-    const mail = new Mail()
       .setSubject('Bigcapital - Password Reset')
       .setView('mail/ResetPassword.html')
       .setTo(user.email)
       .setAttachments([
         {
           filename: 'bigcapital.png',
-          path: root,
+          path: `${global.__views_dir}/images/bigcapital.png`,
           cid: 'bigcapital_logo',
         },
       ])
@@ -65,9 +30,7 @@ export default class AuthenticationMailMesssages {
         resetPasswordUrl: `${config.baseURL}/auth/reset_password/${token}`,
         first_name: user.firstName,
         last_name: user.lastName,
-        contact_us_email: config.contactUsMail,
+      })
-      });
+      .send();
-
-    await mail.send();
   }
 }

packages/server/src/services/Authentication/AuthenticationSMSMessages.ts

@@ -1,19 +0,0 @@
-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);
-  }
-}

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
+   * @param {ICashflowTransaction} cashflowTransaction
-   * @returns {}
+   * @returns {Partial<ILedgerEntry>}
    */
   private getCommonEntry = (cashflowTransaction: ICashflowTransaction) => {
     const { entries, ...transaction } = cashflowTransaction;
@@ -41,7 +41,9 @@ export default class CashflowTransactionJournalEntries {
       ),
       transactionId: transaction.id,
       transactionNumber: transaction.transactionNumber,
-      referenceNo: transaction.referenceNo,
+      referenceNumber: transaction.referenceNo,
+
+      note: transaction.description,
 
       branchId: cashflowTransaction.branchId,
       userId: cashflowTransaction.userId,
@@ -76,9 +78,9 @@ export default class CashflowTransactionJournalEntries {
 
   /**
    * Retrieves the cashflow credit GL entry.
-   * @param   {ICashflowTransaction} cashflowTransaction
+   * @param {ICashflowTransaction} cashflowTransaction
-   * @param   {ICashflowTransactionLine} entry
+   * @param {ICashflowTransactionLine} entry
-   * @param   {number} index
+   * @param {number} index
    * @returns {ILedgerEntry}
    */
   private getCashflowCreditGLEntry = (
@@ -102,10 +104,10 @@ export default class CashflowTransactionJournalEntries {
 
   /**
    * Retrieves the cashflow transaction GL entry.
-   * @param   {ICashflowTransaction} cashflowTransaction
+   * @param {ICashflowTransaction} cashflowTransaction
-   * @param   {ICashflowTransactionLine} entry
+   * @param {ICashflowTransactionLine} entry
-   * @param   {number} index
+   * @param {number} index
-   * @returns
+   * @returns {ILedgerEntry[]}
    */
   private getJournalEntries = (
     cashflowTransaction: ICashflowTransaction
@@ -118,7 +120,7 @@ export default class CashflowTransactionJournalEntries {
 
   /**
    * Retrieves the cashflow GL ledger.
-   * @param   {ICashflowTransaction} cashflowTransaction
+   * @param {ICashflowTransaction} cashflowTransaction
    * @returns {Ledger}
    */
   private getCashflowLedger = (cashflowTransaction: ICashflowTransaction) => {
@@ -130,6 +132,7 @@ 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,
@@ -153,6 +156,7 @@ 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,

packages/server/src/subscribers/Authentication/SendResetPasswordMail.ts

@@ -4,7 +4,7 @@ import events from '@/subscribers/events';
 @Service()
 export default class AuthenticationSubscriber {
   @Inject('agenda')
-  agenda: any;
+  private agenda: any;
 
   /**
    * Attaches events with handlers.

packages/server/src/subscribers/Authentication/SendWelcomeMail.ts

@@ -1,28 +0,0 @@
-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,
-    });
-  };
-}

packages/server/views/mail/LicenseReceive.html

@@ -1,411 +0,0 @@
-<!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>

packages/server/views/mail/ResetPassword.html

@@ -391,10 +391,8 @@
                             </tr>
                           </tbody>
                         </table>
-                        <p>If you did not make this request, please contact us or ignore this message.</p>
+                        <p>If this was a mistake, just ignore this email and nothing will happen.</p>
-                        <p class="email-note">
+                        <p class="email-note">This is an automatically generated email please do not reply to this email.</p>
-                          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>

packages/server/views/mail/Welcome.html

@@ -1,407 +0,0 @@
-<!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>

packages/webapp/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcapital/webapp",
-  "version": "1.7.1",
+  "version": "0.9.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1205,9 +1205,9 @@
       }
     },
     "@blueprintjs-formik/core": {
-      "version": "0.3.3",
+      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/core/-/core-0.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/core/-/core-0.3.4.tgz",
-      "integrity": "sha512-ko7g54YSEcSq2K/GEpmiTG0foGLqe7DwgXGhkGxYEiHhLAUv8WvQmrFsm8e/KOW7n8mLGq0uaZVe2l8m3JTGGQ==",
+      "integrity": "sha512-gksuBYXXvX7IhZXbPEFEAHgmJWp1vt/GTMW0GYBkCoGBAvXy08hIHjMc85M0WNyen+tic3NRas6I2wsjgokgqw==",
       "requires": {
         "lodash.get": "^4.4.2",
         "lodash.keyby": "^4.6.0",
@@ -1227,9 +1227,9 @@
       }
     },
     "@blueprintjs-formik/select": {
-      "version": "0.2.3",
+      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/select/-/select-0.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/@blueprintjs-formik/select/-/select-0.2.5.tgz",
-      "integrity": "sha512-j/zkX0B9wgtoHgK6Z/rlowB7F7zemrAajBU+d3caCoEYMMqwAI0XA++GytqrIhv5fEGjkZ1hkxS9j8eqX8vtjA==",
+      "integrity": "sha512-Sztf5dOemedUBfEjnDWD8ryfMU/x95hyhIgJT5/ywC/jQfX+d/K2OhujklTrCDzQilUeAJLoVkSdV+w77n8ckQ==",
       "requires": {
         "lodash.get": "^4.4.2",
         "lodash.keyby": "^4.6.0",
@@ -17751,4 +17751,4 @@
       "integrity": "sha512-7UlRWU4Q3uCMCeDVMOm7eBrIu145OqsIJ3p6zq58l8UsSYwKWxc6zEapC5YA9tIeh0oheb4cT9Kk2Wq353loFg=="
     }
   }
-}
+}

packages/webapp/package.json

@@ -3,9 +3,9 @@
   "version": "0.9.6",
   "private": true,
   "dependencies": {
-    "@blueprintjs-formik/core": "^0.3.3",
+    "@blueprintjs-formik/core": "^0.3.4",
     "@blueprintjs-formik/datetime": "^0.3.4",
-    "@blueprintjs-formik/select": "^0.2.3",
+    "@blueprintjs-formik/select": "^0.2.5",
     "@blueprintjs/core": "^3.50.2",
     "@blueprintjs/datetime": "^3.23.12",
     "@blueprintjs/popover2": "^0.11.1",

packages/webapp/src/components/Branches/BranchSelect.tsx

@@ -5,59 +5,20 @@ import { MenuItem, Button } from '@blueprintjs/core';
 import { FSelect } from '../Forms';
 
 /**
- *
+ * Branch select field.
- * @param {*} query
- * @param {*} branch
- * @param {*} _index
- * @param {*} exactMatch
- * @returns
- */
-const branchItemPredicate = (query, branch, _index, exactMatch) => {
-  const normalizedTitle = branch.name.toLowerCase();
-  const normalizedQuery = query.toLowerCase();
-
-  if (exactMatch) {
-    return normalizedTitle === normalizedQuery;
-  } else {
-    return `${branch.code}. ${normalizedTitle}`.indexOf(normalizedQuery) >= 0;
-  }
-};
-
-/**
- *
- * @param {*} film
- * @param {*} param1
- * @returns
- */
-const branchItemRenderer = (branch, { handleClick, modifiers, query }) => {
-  const text = `${branch.name}`;
-
-  return (
-    <MenuItem
-      active={modifiers.active}
-      disabled={modifiers.disabled}
-      label={branch.code}
-      key={branch.id}
-      onClick={handleClick}
-      text={text}
-    />
-  );
-};
-
-const branchSelectProps = {
-  itemPredicate: branchItemPredicate,
-  itemRenderer: branchItemRenderer,
-  valueAccessor: 'id',
-  labelAccessor: 'name',
-};
-
-/**
- *
  * @param {*} param0
- * @returns
+ * @returns {JSX.Element}
  */
 export function BranchSelect({ branches, ...rest }) {
-  return <FSelect {...branchSelectProps} {...rest} items={branches} />;
+  return (
+    <FSelect
+      valueAccessor={'id'}
+      textAccessor={'name'}
+      labelAccessor={'code'}
+      {...rest}
+      items={branches}
+    />
+  );
 }
 
 /**

packages/webapp/src/components/Customers/CustomerSelectField.tsx

@@ -1,119 +0,0 @@
-// @ts-nocheck
-import React, { useCallback, useState, useEffect, useMemo } from 'react';
-import { FormattedMessage as T } from '@/components';
-import intl from 'react-intl-universal';
-import * as R from 'ramda';
-
-import { MenuItem, Button } from '@blueprintjs/core';
-import { Select } from '@blueprintjs/select';
-import classNames from 'classnames';
-import { CLASSES } from '@/constants/classes';
-
-import {
-  itemPredicate,
-  handleContactRenderer,
-  createNewItemRenderer,
-  createNewItemFromQuery,
-} from './utils';
-
-import withDrawerActions from '@/containers/Drawer/withDrawerActions';
-
-import { DRAWERS } from '@/constants/drawers';
-
-function CustomerSelectFieldRoot({
-  // #withDrawerActions
-  openDrawer,
-
-  // #ownProps
-  contacts,
-  initialContactId,
-  selectedContactId,
-  defaultSelectText = <T id={'select_contact'} />,
-  onContactSelected,
-  popoverFill = false,
-  disabled = false,
-  allowCreate,
-  buttonProps,
-
-  ...restProps
-}) {
-  const localContacts = useMemo(
-    () =>
-      contacts.map((contact) => ({
-        ...contact,
-        _id: `${contact.id}_${contact.contact_type}`,
-      })),
-    [contacts],
-  );
-
-  const initialContact = useMemo(
-    () => contacts.find((a) => a.id === initialContactId),
-    [initialContactId, contacts],
-  );
-
-  const [selecetedContact, setSelectedContact] = useState(
-    initialContact || null,
-  );
-
-  useEffect(() => {
-    if (typeof selectedContactId !== 'undefined') {
-      const account = selectedContactId
-        ? contacts.find((a) => a.id === selectedContactId)
-        : null;
-      setSelectedContact(account);
-    }
-  }, [selectedContactId, contacts, setSelectedContact]);
-
-  const handleContactSelect = useCallback(
-    (contact) => {
-      if (contact.id) {
-        setSelectedContact({ ...contact });
-        onContactSelected && onContactSelected(contact);
-      } else {
-        openDrawer(DRAWERS.QUICK_CREATE_CUSTOMER);
-      }
-    },
-    [setSelectedContact, onContactSelected, openDrawer],
-  );
-
-  // Maybe inject create new item props to suggest component.
-  const maybeCreateNewItemRenderer = allowCreate ? createNewItemRenderer : null;
-  const maybeCreateNewItemFromQuery = allowCreate
-    ? createNewItemFromQuery
-    : null;
-
-  return (
-    <Select
-      items={localContacts}
-      noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
-      itemRenderer={handleContactRenderer}
-      itemPredicate={itemPredicate}
-      filterable={true}
-      disabled={disabled}
-      onItemSelect={handleContactSelect}
-      popoverProps={{ minimal: true, usePortal: !popoverFill }}
-      className={classNames(CLASSES.FORM_GROUP_LIST_SELECT, {
-        [CLASSES.SELECT_LIST_FILL_POPOVER]: popoverFill,
-      })}
-      inputProps={{
-        placeholder: intl.get('filter_'),
-      }}
-      createNewItemRenderer={maybeCreateNewItemRenderer}
-      createNewItemFromQuery={maybeCreateNewItemFromQuery}
-      createNewItemPosition={'top'}
-      {...restProps}
-    >
-      <Button
-        disabled={disabled}
-        text={
-          selecetedContact ? selecetedContact.display_name : defaultSelectText
-        }
-        {...buttonProps}
-      />
-    </Select>
-  );
-}
-
-export const CustomerSelectField = R.compose(withDrawerActions)(
-  CustomerSelectFieldRoot,
-);

packages/webapp/src/components/Customers/CustomersSelect.tsx

@@ -0,0 +1,48 @@
+// @ts-nocheck
+import React from 'react';
+import * as R from 'ramda';
+import { createNewItemFromQuery, createNewItemRenderer } from './utils';
+import { FSelect } from '../Forms';
+import withDrawerActions from '@/containers/Drawer/withDrawerActions';
+import { DRAWERS } from '@/constants/drawers';
+
+/**
+ * Customer select field.
+ * @returns {React.ReactNode}
+ */
+function CustomerSelectRoot({
+  // #withDrawerActions
+  openDrawer,
+
+  // #ownProps
+  items,
+  allowCreate,
+  ...props
+}) {
+  // Maybe inject create new item props to suggest component.
+  const maybeCreateNewItemRenderer = allowCreate ? createNewItemRenderer : null;
+  const maybeCreateNewItemFromQuery = allowCreate
+    ? createNewItemFromQuery
+    : null;
+
+  // Handles the create item click.
+  const handleCreateItemClick = () => {
+    openDrawer(DRAWERS.QUICK_CREATE_CUSTOMER);
+  };
+
+  return (
+    <FSelect
+      items={items}
+      textAccessor={'display_name'}
+      labelAccessor={'code'}
+      valueAccessor={'id'}
+      popoverProps={{ minimal: true, usePortal: true, inline: false }}
+      createNewItemRenderer={maybeCreateNewItemRenderer}
+      createNewItemFromQuery={maybeCreateNewItemFromQuery}
+      onCreateItemSelect={handleCreateItemClick}
+      {...props}
+    />
+  );
+}
+
+export const CustomersSelect = R.compose(withDrawerActions)(CustomerSelectRoot);

packages/webapp/src/components/Customers/index.tsx

@@ -1,3 +1,3 @@
 // @ts-nocheck
-export * from './CustomerSelectField';
 export * from './CustomerDrawerLink';
+export * from './CustomersSelect';

packages/webapp/src/components/Dashboard/DashboardTopbar/DashboardTopbar.tsx

@@ -53,7 +53,7 @@ function DashboardTopbar({
   };
 
   return (
-    <div class="dashboard__topbar">
+    <div class="dashboard__topbar" data-testId={'dashboard-topbar'}>
       <div class="dashboard__topbar-left">
         <div class="dashboard__topbar-sidebar-toggle">
           <Tooltip

packages/webapp/src/components/Forms/Select.tsx

@@ -16,7 +16,7 @@ export function FSelect({ ...props }) {
       />
     );
   };
-  return <Select input={input} {...props} fill={true} />;
+  return <Select input={input} fill={true} {...props} />;
 }
 
 const SelectButton = styled(Button)`

packages/webapp/src/components/PageForm/FormTopbarSelectInputs.tsx

@@ -0,0 +1,27 @@
+// @ts-nocheck
+import React from 'react';
+import intl from 'react-intl-universal';
+import { Button } from '@blueprintjs/core';
+import { Icon } from '@/components';
+
+export function FormWarehouseSelectButton({ text }) {
+  return (
+    <Button
+      text={intl.get('page_form.warehouse_button.label', { text })}
+      minimal={true}
+      small={true}
+      icon={<Icon icon={'warehouse-16'} iconSize={16} />}
+    />
+  );
+}
+
+export function FormBranchSelectButton({ text }) {
+  return (
+    <Button
+      text={intl.get('page_form.branch_button.label', { text })}
+      minimal={true}
+      small={true}
+      icon={<Icon icon={'branch-16'} iconSize={16} />}
+    />
+  );
+}

packages/webapp/src/components/PageForm/index.ts

@@ -1,3 +1,4 @@
 // @ts-nocheck
 export * from './FormTopbar';
+export * from './FormTopbarSelectInputs';
 export * from './PageFormBigNumber';

packages/webapp/src/components/Vendors/VendorSelectField.tsx

@@ -1,118 +0,0 @@
-// @ts-nocheck
-import React, { useCallback, useState, useEffect, useMemo } from 'react';
-import { FormattedMessage as T } from '@/components';
-import intl from 'react-intl-universal';
-import * as R from 'ramda';
-
-import { MenuItem, Button } from '@blueprintjs/core';
-import { Select } from '@blueprintjs/select';
-import classNames from 'classnames';
-import { CLASSES } from '@/constants/classes';
-
-import {
-  itemPredicate,
-  handleContactRenderer,
-  createNewItemFromQuery,
-  createNewItemRenderer,
-} from './utils';
-import withDrawerActions from '@/containers/Drawer/withDrawerActions';
-
-import { DRAWERS } from '@/constants/drawers';
-
-function VendorSelectFieldRoot({
-  // #withDrawerActions
-  openDrawer,
-
-  // #ownProps
-  contacts,
-  initialContactId,
-  selectedContactId,
-  defaultSelectText = <T id={'select_contact'} />,
-  onContactSelected,
-  popoverFill = false,
-  disabled = false,
-  allowCreate,
-  buttonProps,
-
-  ...restProps
-}) {
-  const localContacts = useMemo(
-    () =>
-      contacts.map((contact) => ({
-        ...contact,
-        _id: `${contact.id}_${contact.contact_type}`,
-      })),
-    [contacts],
-  );
-
-  const initialContact = useMemo(
-    () => contacts.find((a) => a.id === initialContactId),
-    [initialContactId, contacts],
-  );
-
-  const [selecetedContact, setSelectedContact] = useState(
-    initialContact || null,
-  );
-
-  useEffect(() => {
-    if (typeof selectedContactId !== 'undefined') {
-      const account = selectedContactId
-        ? contacts.find((a) => a.id === selectedContactId)
-        : null;
-      setSelectedContact(account);
-    }
-  }, [selectedContactId, contacts, setSelectedContact]);
-
-  const handleContactSelect = useCallback(
-    (contact) => {
-      if (contact.id) {
-        setSelectedContact({ ...contact });
-        onContactSelected && onContactSelected(contact);
-      } else {
-        openDrawer(DRAWERS.QUICK_WRITE_VENDOR);
-      }
-    },
-    [setSelectedContact, onContactSelected, openDrawer],
-  );
-
-  // Maybe inject create new item props to suggest component.
-  const maybeCreateNewItemRenderer = allowCreate ? createNewItemRenderer : null;
-  const maybeCreateNewItemFromQuery = allowCreate
-    ? createNewItemFromQuery
-    : null;
-
-  return (
-    <Select
-      items={localContacts}
-      noResults={<MenuItem disabled={true} text={<T id={'no_results'} />} />}
-      itemRenderer={handleContactRenderer}
-      itemPredicate={itemPredicate}
-      filterable={true}
-      disabled={disabled}
-      onItemSelect={handleContactSelect}
-      popoverProps={{ minimal: true, usePortal: !popoverFill }}
-      className={classNames(CLASSES.FORM_GROUP_LIST_SELECT, {
-        [CLASSES.SELECT_LIST_FILL_POPOVER]: popoverFill,
-      })}
-      inputProps={{
-        placeholder: intl.get('filter_'),
-      }}
-      createNewItemRenderer={maybeCreateNewItemRenderer}
-      createNewItemFromQuery={maybeCreateNewItemFromQuery}
-      createNewItemPosition={'top'}
-      {...restProps}
-    >
-      <Button
-        disabled={disabled}
-        text={
-          selecetedContact ? selecetedContact.display_name : defaultSelectText
-        }
-        {...buttonProps}
-      />
-    </Select>
-  );
-}
-
-export const VendorSelectField = R.compose(withDrawerActions)(
-  VendorSelectFieldRoot,
-);

packages/webapp/src/components/Vendors/VendorsSelect.tsx

@@ -0,0 +1,49 @@
+// @ts-nocheck
+import React from 'react';
+import * as R from 'ramda';
+import withDrawerActions from '@/containers/Drawer/withDrawerActions';
+import { createNewItemFromQuery, createNewItemRenderer } from './utils';
+import { FSelect } from '../Forms';
+import { DRAWERS } from '@/constants/drawers';
+
+/**
+ * Vendor select.
+ * @returns {React.ReactNode}
+ */
+function VendorsSelectRoot({
+  // #withDrawerActions
+  openDrawer,
+
+  // #ownProps
+  items,
+  allowCreate,
+
+  ...restProps
+}) {
+  // Maybe inject create new item props to suggest component.
+  const maybeCreateNewItemRenderer = allowCreate ? createNewItemRenderer : null;
+  const maybeCreateNewItemFromQuery = allowCreate
+    ? createNewItemFromQuery
+    : null;
+
+  // Handles the create item click.
+  const handleCreateItemClick = () => {
+    openDrawer(DRAWERS.QUICK_WRITE_VENDOR);
+  };
+
+  return (
+    <FSelect
+      items={items}
+      textAccessor={'display_name'}
+      labelAccessor={'code'}
+      valueAccessor={'id'}
+      popoverProps={{ minimal: true, usePortal: true, inline: false }}
+      createNewItemRenderer={maybeCreateNewItemRenderer}
+      createNewItemFromQuery={maybeCreateNewItemFromQuery}
+      onCreateItemSelect={handleCreateItemClick}
+      {...restProps}
+    />
+  );
+}
+
+export const VendorsSelect = R.compose(withDrawerActions)(VendorsSelectRoot);

packages/webapp/src/components/Vendors/index.tsx

@@ -1,3 +1,3 @@
 // @ts-nocheck
 export * from './VendorDrawerLink'
-export * from './VendorSelectField'
+export * from './VendorsSelect';

packages/webapp/src/components/Warehouses/WarehouseSelect.tsx

@@ -1,75 +1,21 @@
 // @ts-nocheck
 import React from 'react';
-
-import { MenuItem, Button } from '@blueprintjs/core';
 import { FSelect } from '../Forms';
 
 /**
- *
+ * Warehouse select field.
- * @param {*} query
- * @param {*} warehouse
- * @param {*} _index
- * @param {*} exactMatch
- * @returns
- */
-const warehouseItemPredicate = (query, warehouse, _index, exactMatch) => {
-  const normalizedTitle = warehouse.name.toLowerCase();
-  const normalizedQuery = query.toLowerCase();
-
-  if (exactMatch) {
-    return normalizedTitle === normalizedQuery;
-  } else {
-    return (
-      `${warehouse.code}. ${normalizedTitle}`.indexOf(normalizedQuery) >= 0
-    );
-  }
-};
-
-/**
- *
- * @param {*} film
- * @param {*} param1
- * @returns
- */
-const warehouseItemRenderer = (
-  warehouse,
-  { handleClick, modifiers, query },
-) => {
-  const text = `${warehouse.name}`;
-
-  return (
-    <MenuItem
-      active={modifiers.active}
-      disabled={modifiers.disabled}
-      label={warehouse.code}
-      key={warehouse.id}
-      onClick={handleClick}
-      text={text}
-    />
-  );
-};
-
-const warehouseSelectProps = {
-  itemPredicate: warehouseItemPredicate,
-  itemRenderer: warehouseItemRenderer,
-  valueAccessor: 'id',
-  labelAccessor: 'name',
-};
-
-/**
- *
  * @param {*} param0
  * @returns
  */
 export function WarehouseSelect({ warehouses, ...rest }) {
-  return <FSelect {...warehouseSelectProps} {...rest} items={warehouses} />;
+  return (
-}
+    <FSelect
-
+      valueAccessor={'id'}
-/**
+      labelAccessor={'code'}
- *
+      textAccessor={'name'}
- * @param {*} param0
+      popoverProps={{ minimal: true, usePortal: true, inline: false }}
- * @returns
+      {...rest}
- */
+      items={warehouses}
-export function WarehouseSelectButton({ label, ...rest }) {
+    />
-  return <Button text={label} />;
+  );
 }

packages/webapp/src/constants/adjustmentType.tsx

@@ -1,7 +0,0 @@
-// @ts-nocheck
-import intl from 'react-intl-universal';
-
-export default [
-  { name: intl.get('decrement'), value: 'decrement' },
-  { name: intl.get('increment'), value: 'increment' },
-]

packages/webapp/src/constants/index.tsx

@@ -4,7 +4,6 @@ export * from './tableStyle';
 export * from './features';
 export * from './cellTypes';
 export * from './classes';
-export * from './adjustmentType';
 export * from './cashflowOptions';
 
 export const Align = { Left: 'left', Right: 'right', Center: 'center' };

packages/webapp/src/constants/sidebarMenu.tsx

@@ -25,13 +25,14 @@ import {
   CashflowAction,
   PreferencesAbility,
 } from '@/constants/abilityOption';
+import { DialogsName } from './dialogs';
 
 export const SidebarMenu = [
   // ---------------
   // # Homepage
   // ---------------
   {
-    text: <T id={'homepage'} />,
+    text: <T id={'sidebar.homepage'} />,
     type: ISidebarMenuItemType.Link,
     disabled: false,
     href: '/',
@@ -41,20 +42,20 @@ export const SidebarMenu = [
   // # Sales & Inventory
   // ---------------
   {
-    text: <T id={'sales_inventory'} />,
+    text: <T id={'sidebar.sales_inventory'} />,
     type: ISidebarMenuItemType.Group,
     children: [
       {
-        text: <T id={'items'} />,
+        text: <T id={'sidebar.items'} />,
         type: ISidebarMenuItemType.Overlay,
         overlayId: ISidebarMenuOverlayIds.Items,
         children: [
           {
-            text: <T id={'items'} />,
+            text: <T id={'sidebar.items'} />,
             type: ISidebarMenuItemType.Group,
             children: [
               {
-                text: <T id={'items'} />,
+                text: <T id={'sidebar.items'} />,
                 href: '/items',
                 type: ISidebarMenuItemType.Link,
                 permission: {
@@ -63,7 +64,7 @@ export const SidebarMenu = [
                 },
               },
               {
-                text: <T id={'inventory_adjustments'} />,
+                text: <T id={'sidebar.inventory_adjustments'} />,
                 href: '/inventory-adjustments',
                 type: ISidebarMenuItemType.Link,
                 permission: {
@@ -71,12 +72,6 @@ export const SidebarMenu = [
                   ability: InventoryAdjustmentAction.View,
                 },
               },
-              {
-                text: <T id={'sidebar_warehouse_transfer'} />,
-                href: '/warehouses-transfers',
-                type: ISidebarMenuItemType.Link,
-                feature: Features.Warehouses,
-              },
               {
                 text: <T id={'category_list'} />,
                 href: '/items/categories',
@@ -86,31 +81,20 @@ export const SidebarMenu = [
                   ability: ItemAction.View,
                 },
               },
-            ],
-          },
-          {
-            text: <T id={'New tasks'} />,
-            type: ISidebarMenuItemType.Group,
-            children: [
               {
-                text: <T id={'New inventory item'} />,
+                text: <T id={'sidebar.warehouse_transfer'} />,
-                href: '/items/new',
+                href: '/warehouses-transfers',
-                type: ISidebarMenuItemType.Link,
-                permission: {
-                  subject: AbilitySubject.Item,
-                  ability: ItemAction.Create,
-                },
-              },
-              {
-                text: (
-                  <T id={'warehouse_transfer.label.new_warehouse_transfer'} />
-                ),
-                href: '/warehouses-transfers/new',
                 type: ISidebarMenuItemType.Link,
                 feature: Features.Warehouses,
               },
+            ],
+          },
+          {
+            text: <T id={'sidebar.new_tasks'} />,
+            type: ISidebarMenuItemType.Group,
+            children: [
               {
-                text: <T id={'New service'} />,
+                text: <T id={'sidebar.new_inventory_item'} />,
                 href: '/items/new',
                 type: ISidebarMenuItemType.Link,
                 permission: {
@@ -119,15 +103,30 @@ export const SidebarMenu = [
                 },
               },
               {
-                text: <T id={'New item category'} />,
+                text: <T id={'sidebar.new_service'} />,
-                href: '/items/categories/new',
+                href: '/items/new',
-                type: ISidebarMenuItemType.Dialog,
+                type: ISidebarMenuItemType.Link,
-                dialogName: 'item-category-form',
                 permission: {
                   subject: AbilitySubject.Item,
                   ability: ItemAction.Create,
                 },
               },
+              {
+                text: <T id={'sidebar.new_item_category'} />,
+                href: '/items/categories/new',
+                type: ISidebarMenuItemType.Dialog,
+                dialogName: DialogsName.ItemCategoryForm,
+                permission: {
+                  subject: AbilitySubject.Item,
+                  ability: ItemAction.Create,
+                },
+              },
+              {
+                text: <T id={'sidebar.new_warehouse_transfer'} />,
+                href: '/warehouses-transfers/new',
+                type: ISidebarMenuItemType.Link,
+                feature: Features.Warehouses,
+              },
             ],
           },
         ],
@@ -138,16 +137,16 @@ export const SidebarMenu = [
   // # Sales
   // ---------------
   {
-    text: <T id={'sales'} />,
+    text: <T id={'sidebar.sales'} />,
     type: ISidebarMenuItemType.Overlay,
     overlayId: ISidebarMenuOverlayIds.Sales,
     children: [
       {
-        text: <T id={'sales'} />,
+        text: <T id={'sidebar.sales'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'estimates'} />,
+            text: <T id={'sidebar.estimates'} />,
             href: '/estimates',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -156,7 +155,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'invoices'} />,
+            text: <T id={'sidebar.invoices'} />,
             href: '/invoices',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -165,7 +164,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'receipts'} />,
+            text: <T id={'sidebar.receipts'} />,
             href: '/receipts',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -174,12 +173,12 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'sidebar_credit_note'} />,
+            text: <T id={'sidebar.credit_notes'} />,
             href: '/credit-notes',
             type: ISidebarMenuItemType.Link,
           },
           {
-            text: <T id={'payment_receives'} />,
+            text: <T id={'sidebar.payment_receives'} />,
             href: '/payment-receives',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -190,11 +189,11 @@ export const SidebarMenu = [
         ],
       },
       {
-        text: <T id={'New tasks'} />,
+        text: <T id={'sidebar.new_tasks'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'new_estimate'} />,
+            text: <T id={'sidebar.new_estimate'} />,
             href: '/estimates/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -203,7 +202,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'new_invoice'} />,
+            text: <T id={'sidebar.new_invoice'} />,
             href: '/invoices/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -212,7 +211,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'new_receipt'} />,
+            text: <T id={'sidebar.new_receipt'} />,
             href: '/receipts/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -221,12 +220,12 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'credit_note.label.new_credit_note'} />,
+            text: <T id={'sidebar.new_credit_note'} />,
             href: '/credit-notes/new',
             type: ISidebarMenuItemType.Link,
           },
           {
-            text: <T id={'new_payment_receive'} />,
+            text: <T id={'sidebar.new_payment_receive'} />,
             href: '/payment-receives/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -242,12 +241,12 @@ export const SidebarMenu = [
   // # Purchases
   // ---------------
   {
-    text: <T id={'purchases'} />,
+    text: <T id={'sidebar.purchases'} />,
     type: ISidebarMenuItemType.Overlay,
     overlayId: ISidebarMenuOverlayIds.Purchases,
     children: [
       {
-        text: <T id={'purchases'} />,
+        text: <T id={'sidebar.purchases'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
@@ -276,11 +275,11 @@ export const SidebarMenu = [
         ],
       },
       {
-        text: <T id={'New tasks'} />,
+        text: <T id={'sidebar.new_tasks'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'New purchase invoice'} />,
+            text: <T id={'sidebar.new_purchase_invoice'} />,
             href: '/bills/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -289,7 +288,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'vendor_credits.label.new_vendor_credit'} />,
+            text: <T id={'sidebar.new_vendor_credit'} />,
             href: '/vendor-credits/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -298,7 +297,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'new_payment_made'} />,
+            text: <T id={'sidebar.new_payment_made'} />,
             href: '/payment-mades/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -314,16 +313,16 @@ export const SidebarMenu = [
   // # Contacts
   // ---------------
   {
-    text: <T id={'contacts'} />,
+    text: <T id={'sidebar.contacts'} />,
     type: ISidebarMenuItemType.Overlay,
     overlayId: ISidebarMenuOverlayIds.Contacts,
     children: [
       {
-        text: <T id={'contacts'} />,
+        text: <T id={'sidebar.contacts'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'customers'} />,
+            text: <T id={'sidebar.customers'} />,
             href: '/customers',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -332,7 +331,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'vendors'} />,
+            text: <T id={'sidebar.vendors'} />,
             href: '/vendors',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -343,11 +342,11 @@ export const SidebarMenu = [
         ],
       },
       {
-        text: <T id={'New tasks'} />,
+        text: <T id={'sidebar.new_tasks'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'new_customer'} />,
+            text: <T id={'sidebar.new_customer'} />,
             href: '/customers/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -356,7 +355,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'new_vendor'} />,
+            text: <T id={'sidebar.new_vendor'} />,
             href: '/vendors/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -372,20 +371,20 @@ export const SidebarMenu = [
   // # Accounting
   // ---------------
   {
-    text: <T id={'accounting'} />,
+    text: <T id={'sidebar.accounting'} />,
     type: ISidebarMenuItemType.Group,
     children: [
       {
-        text: <T id={'financial'} />,
+        text: <T id={'sidebar.financial'} />,
         type: ISidebarMenuItemType.Overlay,
         overlayId: ISidebarMenuOverlayIds.Financial,
         children: [
           {
-            text: <T id={'financial'} />,
+            text: <T id={'sidebar.financial'} />,
             type: ISidebarMenuItemType.Group,
             children: [
               {
-                text: <T id={'accounts_chart'} />,
+                text: <T id={'sidebar.accounts_chart'} />,
                 href: '/accounts',
                 type: ISidebarMenuItemType.Link,
                 permission: {
@@ -394,7 +393,7 @@ export const SidebarMenu = [
                 },
               },
               {
-                text: <T id={'manual_journals'} />,
+                text: <T id={'sidebar.manual_journals'} />,
                 href: '/manual-journals',
                 type: ISidebarMenuItemType.Link,
                 permission: {
@@ -410,11 +409,11 @@ export const SidebarMenu = [
             ],
           },
           {
-            text: <T id={'New tasks'} />,
+            text: <T id={'sidebar.new_tasks'} />,
             type: ISidebarMenuItemType.Group,
             children: [
               {
-                text: <T id={'make_journal_entry'} />,
+                text: <T id={'sidebar.make_journal_entry'} />,
                 href: '/make-journal-entry',
                 type: ISidebarMenuItemType.Link,
                 permission: {
@@ -441,7 +440,7 @@ export const SidebarMenu = [
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'siebar.cashflow.label_cash_and_bank_accounts'} />,
+            text: <T id={'sidebar.cash_bank_accounts'} />,
             href: '/cashflow-accounts',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -452,42 +451,45 @@ export const SidebarMenu = [
         ],
       },
       {
-        text: <T id={'New tasks'} />,
+        text: <T id={'sidebar.new_tasks'} />,
         type: ISidebarMenuItemType.Group,
         divider: true,
         children: [
           {
-            text: <T id={'cash_flow.label.add_money_in'} />,
+            text: <T id={'sidebar.add_money_in'} />,
             href: '/cashflow-accounts',
             type: ISidebarMenuItemType.Dialog,
-            dialogName: 'money-in',
+            dialogName: DialogsName.MoneyInForm,
             permission: {
               subject: AbilitySubject.Cashflow,
               ability: CashflowAction.Create,
             },
           },
           {
-            text: <T id={'cash_flow.label.add_money_out'} />,
+            text: <T id={'sidebar.add_money_out'} />,
             href: '/cashflow-accounts',
             type: ISidebarMenuItemType.Dialog,
+            dialogName: DialogsName.MoneyOutForm,
             permission: {
               subject: AbilitySubject.Cashflow,
               ability: CashflowAction.Create,
             },
           },
           {
-            text: <T id={'cash_flow.label.add_cash_account'} />,
+            text: <T id={'sidebar.add_cash_account'} />,
             href: '/cashflow-accounts',
             type: ISidebarMenuItemType.Dialog,
+            dialogName: DialogsName.AccountForm,
             permission: {
               subject: AbilitySubject.Cashflow,
               ability: CashflowAction.Create,
             },
           },
           {
-            text: <T id={'cash_flow.label.add_bank_account'} />,
+            text: <T id={'sidebar.add_bank_account'} />,
             href: '/cashflow-accounts',
             type: ISidebarMenuItemType.Dialog,
+            dialogName: DialogsName.AccountForm,
             permission: {
               subject: AbilitySubject.Cashflow,
               ability: CashflowAction.Create,
@@ -501,16 +503,16 @@ export const SidebarMenu = [
   // # Expenses
   // ---------------
   {
-    text: <T id={'expenses'} />,
+    text: <T id={'sidebar.expenses'} />,
     type: ISidebarMenuItemType.Overlay,
     overlayId: ISidebarMenuOverlayIds.Expenses,
     children: [
       {
-        text: <T id={'expenses'} />,
+        text: <T id={'sidebar.expenses'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'expenses'} />,
+            text: <T id={'sidebar.expenses'} />,
             href: '/expenses',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -521,11 +523,11 @@ export const SidebarMenu = [
         ],
       },
       {
-        text: <T id={'New tasks'} />,
+        text: <T id={'sidebar.new_tasks'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'new_expense'} />,
+            text: <T id={'sidebar.new_expense'} />,
             href: '/expenses/new',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -541,16 +543,16 @@ export const SidebarMenu = [
   // # Projects Management
   // ---------------------
   // {
-  //   text: 'Projects',
+  //   text: <T id={'sidebar.projects'} />,
   //   type: ISidebarMenuItemType.Overlay,
   //   overlayId: ISidebarMenuOverlayIds.Projects,
   //   children: [
   //     {
-  //       text: 'Projects',
+  //       text: <T id={'sidebar.projects'} />,
   //       type: ISidebarMenuItemType.Group,
   //       children: [
   //         {
-  //           text: 'Projects',
+  //           text: <T id={'sidebar.projects'} />,
   //           href: '/projects',
   //           type: ISidebarMenuItemType.Link,
   //           permission: {
@@ -561,11 +563,11 @@ export const SidebarMenu = [
   //       ],
   //     },
   //     {
-  //       text: <T id={'New tasks'} />,
+  //       text: <T id={'sidebar.new_tasks'} />,
   //       type: ISidebarMenuItemType.Group,
   //       children: [
   //         {
-  //           text: <T id={'projects.label.new_project'} />,
+  //           text: <T id={'sidebar.new_project'} />,
   //           type: ISidebarMenuItemType.Dialog,
   //           dialogName: 'project-form',
   //           permission: {
@@ -574,18 +576,18 @@ export const SidebarMenu = [
   //           },
   //         },
   //         {
-  //           text: <T id={'projects.label.new_time_entry'} />,
+  //           text: <T id={'sidebar.new_time_entry'} />,
   //           type: ISidebarMenuItemType.Dialog,
   //           dialogName: 'project-time-entry-form',
   //         },
   //       ],
   //     },
   //     {
-  //       text: <T id={'Reports'} />,
+  //       text: <T id={'sidebar.reports'} />,
   //       type: ISidebarMenuItemType.Group,
   //       children: [
   //         {
-  //           text: <T id={'project_profitability_summary'} />,
+  //           text: <T id={'sidebar.project_profitability_summary'} />,
   //           href: '/financial-reports/project-profitability-summary',
   //           type: ISidebarMenuItemType.Link,
   //         },
@@ -597,16 +599,16 @@ export const SidebarMenu = [
   // # Reports
   // ---------------
   {
-    text: <T id={'Reports'} />,
+    text: <T id={'sidebar.reports'} />,
     type: ISidebarMenuItemType.Overlay,
     overlayId: ISidebarMenuOverlayIds.Reports,
     children: [
       {
-        text: <T id={'Reports'} />,
+        text: <T id={'sidebar.reports'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'balance_sheet'} />,
+            text: <T id={'sidebar.balance_sheet'} />,
             href: '/financial-reports/balance-sheet',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -615,7 +617,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'trial_balance_sheet'} />,
+            text: <T id={'sidebar.trial_balance_sheet'} />,
             href: '/financial-reports/trial-balance-sheet',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -624,7 +626,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'journal'} />,
+            text: <T id={'sidebar.journal'} />,
             href: '/financial-reports/journal-sheet',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -633,7 +635,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'general_ledger'} />,
+            text: <T id={'sidebar.general_ledger'} />,
             href: '/financial-reports/general-ledger',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -642,7 +644,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'profit_loss_sheet'} />,
+            text: <T id={'sidebar.profit_loss_sheet'} />,
             href: '/financial-reports/profit-loss-sheet',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -651,7 +653,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'cash_flow_statement'} />,
+            text: <T id={'sidebar.cash_flow_statement'} />,
             href: '/financial-reports/cash-flow',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -660,7 +662,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'AR_Aging_Summary'} />,
+            text: <T id={'sidebar.ar_aging_Summary'} />,
             href: '/financial-reports/receivable-aging-summary',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -669,7 +671,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'AP_Aging_Summary'} />,
+            text: <T id={'sidebar.ap_aging_summary'} />,
             href: '/financial-reports/payable-aging-summary',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -680,11 +682,11 @@ export const SidebarMenu = [
         ],
       },
       {
-        text: <T id={'Sales/Purchases'} />,
+        text: <T id={'sidebar.sales_purchases'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'purchases_by_items'} />,
+            text: <T id={'sidebar.purchases_by_items'} />,
             type: ISidebarMenuItemType.Link,
             href: '/financial-reports/purchases-by-items',
             permission: {
@@ -693,7 +695,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'sales_by_items'} />,
+            text: <T id={'sidebar.sales_by_items'} />,
             href: '/financial-reports/sales-by-items',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -702,7 +704,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'customers_transactions'} />,
+            text: <T id={'sidebar.customers_transactions'} />,
             href: '/financial-reports/transactions-by-customers',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -711,7 +713,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'vendors_transactions'} />,
+            text: <T id={'sidebar.vendors_transactions'} />,
             href: '/financial-reports/transactions-by-vendors',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -720,7 +722,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'customers_balance_summary'} />,
+            text: <T id={'sidebar.customers_balance_summary'} />,
             href: '/financial-reports/customers-balance-summary',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -729,7 +731,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'vendors_balance_summary'} />,
+            text: <T id={'sidebar.vendors_balance_summary'} />,
             href: '/financial-reports/vendors-balance-summary',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -740,11 +742,11 @@ export const SidebarMenu = [
         ],
       },
       {
-        text: <T id={'inventory'} />,
+        text: <T id={'sidebar.inventory'} />,
         type: ISidebarMenuItemType.Group,
         children: [
           {
-            text: <T id={'inventory_item_details'} />,
+            text: <T id={'sidebar.inventory_item_details'} />,
             href: '/financial-reports/inventory-item-details',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -753,7 +755,7 @@ export const SidebarMenu = [
             },
           },
           {
-            text: <T id={'inventory_valuation'} />,
+            text: <T id={'sidebar.inventory_valuation'} />,
             href: '/financial-reports/inventory-valuation',
             type: ISidebarMenuItemType.Link,
             permission: {
@@ -766,11 +768,11 @@ export const SidebarMenu = [
     ],
   },
   {
-    text: <T id={'system'} />,
+    text: <T id={'sidebar.system'} />,
     type: ISidebarMenuItemType.Group,
     children: [
       {
-        text: <T id={'preferences'} />,
+        text: <T id={'sidebar.preferences'} />,
         href: '/preferences',
         type: ISidebarMenuItemType.Link,
         permission: {

packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalEntriesHeaderFields.tsx

@@ -1,14 +1,8 @@
 // @ts-nocheck
 import React from 'react';
-import {
+import { InputGroup, FormGroup, Position } from '@blueprintjs/core';
-  InputGroup,
+import { FastField, ErrorMessage } from 'formik';
-  FormGroup,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
-import { FastField, ErrorMessage, useFormikContext } from 'formik';
 import { DateInput } from '@blueprintjs/datetime';
-import * as R from 'ramda';
 import classNames from 'classnames';
 
 import { CLASSES } from '@/constants/classes';
@@ -20,99 +14,15 @@ import {
 } from '@/utils';
 import {
   Hint,
-  FieldHint,
   FieldRequiredHint,
   Icon,
-  InputPrependButton,
   CurrencySelectList,
   FormattedMessage as T,
-  FInputGroup,
-  FFormGroup,
 } from '@/components';
 import { useMakeJournalFormContext } from './MakeJournalProvider';
 import { JournalExchangeRateInputField } from './components';
 import { currenciesFieldShouldUpdate } from './utils';
-
+import { MakeJournalTransactionNoField } from './MakeJournalTransactionNoField';
-import withSettings from '@/containers/Settings/withSettings';
-import withDialogActions from '@/containers/Dialog/withDialogActions';
-
-/**
- * Journal number field of make journal form.
- */
-const MakeJournalTransactionNoField = R.compose(
-  withDialogActions,
-  withSettings(({ manualJournalsSettings }) => ({
-    journalAutoIncrement: manualJournalsSettings?.autoIncrement,
-  })),
-)(
-  ({
-    // #withDialog
-    openDialog,
-
-    // #withSettings
-    journalAutoIncrement,
-  }) => {
-    const { setFieldValue, values } = useFormikContext();
-
-    const handleJournalNumberChange = () => {
-      openDialog('journal-number-form');
-    };
-    const handleJournalNoBlur = (event) => {
-      const newValue = event.target.value;
-
-      if (values.journal_number !== newValue && journalAutoIncrement) {
-        openDialog('journal-number-form', {
-          initialFormValues: {
-            onceManualNumber: newValue,
-            incrementMode: 'manual-transaction',
-          },
-        });
-      }
-      if (!journalAutoIncrement) {
-        setFieldValue('journal_number', newValue);
-        setFieldValue('journal_number_manually', newValue);
-      }
-    };
-
-    return (
-      <FFormGroup
-        name={'journal_number'}
-        label={<T id={'journal_no'} />}
-        labelInfo={
-          <>
-            <FieldRequiredHint />
-            <FieldHint />
-          </>
-        }
-        fill={true}
-        inline={true}
-        fastField={true}
-      >
-        <ControlGroup fill={true}>
-          <FInputGroup
-            name={'journal_number'}
-            fill={true}
-            asyncControl={true}
-            onBlur={handleJournalNoBlur}
-            fastField={true}
-            onChange={() => {}}
-          />
-          <InputPrependButton
-            buttonProps={{
-              onClick: handleJournalNumberChange,
-              icon: <Icon icon={'settings-18'} />,
-            }}
-            tooltip={true}
-            tooltipProps={{
-              content: <T id={'setting_your_auto_generated_journal_number'} />,
-              position: Position.BOTTOM_LEFT,
-            }}
-          />
-        </ControlGroup>
-      </FFormGroup>
-    );
-  },
-);
 
 /**
  * Make journal entries header.

packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.tsx

@@ -1,6 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import styled from 'styled-components';
+import intl from 'react-intl-universal';
 import { FFormGroup, FEditableText, FormattedMessage as T } from '@/components';
 
 export function MakeJournalFormFooterLeft() {
@@ -13,7 +14,7 @@ export function MakeJournalFormFooterLeft() {
       >
         <FEditableText
           name={'description'}
-          placeholder={<T id={'make_jorunal.decscrption.placeholder'} />}
+          placeholder={intl.get('make_jorunal.decscrption.placeholder')}
         />
       </DescriptionFormGroup>
     </React.Fragment>

packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormTopBar.tsx

@@ -11,6 +11,7 @@ import {
   FeatureCan,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormBranchSelectButton,
 } from '@/components';
 import { useMakeJournalFormContext } from './MakeJournalProvider';
 
@@ -51,18 +52,9 @@ function MakeJournalFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={MakeJournalBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
-    />
+      fill={false}
-  );
-}
-function MakeJournalBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('make_journal.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
     />
   );
 }

packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalTransactionNoField.tsx

@@ -0,0 +1,97 @@
+// @ts-nocheck
+import React from 'react';
+import { Position, ControlGroup } from '@blueprintjs/core';
+import { useFormikContext } from 'formik';
+import * as R from 'ramda';
+import {
+  FieldHint,
+  FieldRequiredHint,
+  Icon,
+  InputPrependButton,
+  FormattedMessage as T,
+  FInputGroup,
+  FFormGroup,
+} from '@/components';
+
+import withSettings from '@/containers/Settings/withSettings';
+import withDialogActions from '@/containers/Dialog/withDialogActions';
+
+/**
+ * Journal number field of make journal form.
+ */
+export const MakeJournalTransactionNoField = R.compose(
+  withDialogActions,
+  withSettings(({ manualJournalsSettings }) => ({
+    journalAutoIncrement: manualJournalsSettings?.autoIncrement,
+  })),
+)(
+  ({
+    // #withDialog
+    openDialog,
+
+    // #withSettings
+    journalAutoIncrement,
+  }) => {
+    const { setFieldValue, values } = useFormikContext();
+
+    const handleJournalNumberChange = () => {
+      openDialog('journal-number-form');
+    };
+    const handleJournalNoBlur = (event) => {
+      const newValue = event.target.value;
+
+      if (values.journal_number !== newValue && journalAutoIncrement) {
+        openDialog('journal-number-form', {
+          initialFormValues: {
+            onceManualNumber: newValue,
+            incrementMode: 'manual-transaction',
+          },
+        });
+      }
+      if (!journalAutoIncrement) {
+        setFieldValue('journal_number', newValue);
+        setFieldValue('journal_number_manually', newValue);
+      }
+    };
+
+    return (
+      <FFormGroup
+        name={'journal_number'}
+        label={<T id={'journal_no'} />}
+        labelInfo={
+          <>
+            <FieldRequiredHint />
+            <FieldHint />
+          </>
+        }
+        fill={true}
+        inline={true}
+        fastField={true}
+      >
+        <ControlGroup fill={true}>
+          <FInputGroup
+            name={'journal_number'}
+            fill={true}
+            asyncControl={true}
+            onBlur={handleJournalNoBlur}
+            fastField={true}
+            onChange={() => {}}
+          />
+          <InputPrependButton
+            buttonProps={{
+              onClick: handleJournalNumberChange,
+              icon: <Icon icon={'settings-18'} />,
+            }}
+            tooltip={true}
+            tooltipProps={{
+              content: <T id={'setting_your_auto_generated_journal_number'} />,
+              position: Position.BOTTOM_LEFT,
+            }}
+          />
+        </ControlGroup>
+      </FFormGroup>
+    );
+  },
+);
+
+MakeJournalTransactionNoField.displayName = 'MakeJournalTransactionNoField';

packages/webapp/src/containers/Accounting/MakeJournal/components.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React, { useEffect } from 'react';
 import intl from 'react-intl-universal';
-import { Menu, MenuItem, Position, Button } from '@blueprintjs/core';
+import { Menu, MenuItem, Position, Button, Intent } from '@blueprintjs/core';
 import { Popover2 } from '@blueprintjs/popover2';
 import { useFormikContext } from 'formik';
 import * as R from 'ramda';
@@ -74,6 +74,7 @@ export const ActionsCellRenderer = ({
   const exampleMenu = (
     <Menu>
       <MenuItem
+        intent={Intent.DANGER}
         onClick={handleClickRemoveRole}
         text={intl.get('make_journal.entries.remove_row')}
       />

packages/webapp/src/containers/Authentication/utils.tsx

@@ -23,11 +23,11 @@ export const RegisterSchema = Yup.object().shape({
   first_name: Yup.string().required().label(intl.get('first_name_')),
   last_name: Yup.string().required().label(intl.get('last_name_')),
   email: Yup.string().email().required().label(intl.get('email')),
-  password: Yup.string().min(4).required().label(intl.get('password')),
+  password: Yup.string().min(6).required().label(intl.get('password')),
 });
 
 export const ResetPasswordSchema = Yup.object().shape({
-  password: Yup.string().min(4).required().label(intl.get('password')),
+  password: Yup.string().min(6).required().label(intl.get('password')),
   confirm_password: Yup.string()
     .oneOf([Yup.ref('password'), null])
     .required()

packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInContentFields.tsx

@@ -1,18 +1,22 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useMemo } from 'react';
+import { useFormikContext } from 'formik';
 
 import OwnerContributionFormFields from './OwnerContribution/OwnerContributionFormFields';
 import OtherIncomeFormFields from './OtherIncome/OtherIncomeFormFields';
 import TransferFromAccountFormFields from './TransferFromAccount/TransferFromAccountFormFields';
+import { MoneyInFieldsProvider } from './MoneyInFieldsProvider';
 
 /**
- *
+ * Money-in dialog content.
- * @param param0
+ * Switches between fields based on the given transaction type.
- * @returns
+ * @returns {JSX.Element}
  */
-export default function MoneyInContentFields({ accountType }) {
+export default function MoneyInContentFields() {
-  const handleTransactionType = () => {
+  const { values } = useFormikContext();
-    switch (accountType) {
+
+  const transactionFields = useMemo(() => {
+    switch (values.transaction_type) {
       case 'owner_contribution':
         return <OwnerContributionFormFields />;
 
@@ -24,6 +28,10 @@ export default function MoneyInContentFields({ accountType }) {
       default:
         break;
     }
-  };
+  }, [values.transaction_type]);
-  return <React.Fragment>{handleTransactionType()}</React.Fragment>;
+
+  // Cannot continue if transaction type or account is not selected.
+  if (!values.transaction_type || !values.cashflow_account_id) return null;
+
+  return <MoneyInFieldsProvider>{transactionFields}</MoneyInFieldsProvider>;
 }

packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogContent.tsx

@@ -1,6 +1,5 @@
 // @ts-nocheck
 import React from 'react';
-
 import { MoneyInDialogProvider } from './MoneyInDialogProvider';
 import MoneyInForm from './MoneyInForm';
 

packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx

@@ -1,11 +1,10 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useState } from 'react';
 import { DialogContent } from '@/components';
 import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import {
   useCreateCashflowTransaction,
-  useAccount,
   useAccounts,
   useBranches,
   useCashflowAccounts,
@@ -18,21 +17,20 @@ const MoneyInDialogContent = React.createContext();
  * Money in dialog provider.
  */
 function MoneyInDialogProvider({
-  accountId,
+  accountId: defaultAccountId,
   accountType,
   dialogName,
   ...props
 }) {
+  // Holds the selected account id of the dialog.
+  const [accountId, setAccountId] = useState<number | null>(defaultAccountId);
+
+  // Detarmines whether the feature is enabled.
   const { featureCan } = useFeatureCan();
   const isBranchFeatureCan = featureCan(Features.Branches);
 
   // Fetches accounts list.
-  const { isFetching: isAccountsLoading, data: accounts } = useAccounts();
+  const { isLoading: isAccountsLoading, data: accounts } = useAccounts();
-
-  // Fetches the specific account details.
-  const { data: account, isLoading: isAccountLoading } = useAccount(accountId, {
-    enabled: !!accountId,
-  });
 
   // Fetches the branches list.
   const {
@@ -41,10 +39,11 @@ function MoneyInDialogProvider({
     isSuccess: isBranchesSuccess,
   } = useBranches({}, { enabled: isBranchFeatureCan });
 
-  // Fetch cash flow list .
+  // Fetch cash flow list.
   const { data: cashflowAccounts, isLoading: isCashFlowAccountsLoading } =
     useCashflowAccounts({}, { keepPreviousData: true });
 
+  // Mutation create cashflow transaction.
   const { mutateAsync: createCashflowTransactionMutate } =
     useCreateCashflowTransaction();
 
@@ -54,12 +53,15 @@ function MoneyInDialogProvider({
   // Submit payload.
   const [submitPayload, setSubmitPayload] = React.useState({});
 
-  //  provider.
+  // Provider data.
   const provider = {
     accounts,
-    account,
     branches,
+
     accountId,
+    defaultAccountId,
+    setAccountId,
+
     accountType,
     isAccountsLoading,
     isBranchesSuccess,
@@ -73,15 +75,14 @@ function MoneyInDialogProvider({
     setSubmitPayload,
   };
 
+  const isLoading =
+    isAccountsLoading ||
+    isCashFlowAccountsLoading ||
+    isBranchesLoading ||
+    isSettingsLoading;
+
   return (
-    <DialogContent
+    <DialogContent isLoading={isLoading}>
-      isLoading={
-        isAccountsLoading ||
-        isCashFlowAccountsLoading ||
-        isBranchesLoading ||
-        isSettingsLoading
-      }
-    >
       <MoneyInDialogContent.Provider value={provider} {...props} />
     </DialogContent>
   );

packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInExchangeRateField.tsx

@@ -0,0 +1,26 @@
+// @ts-nocheck
+import React from 'react';
+import { ExchangeRateMutedField } from '@/components';
+import { useForeignAccount } from './utils';
+import { useFormikContext } from 'formik';
+import { useMoneyInFieldsContext } from './MoneyInFieldsProvider';
+
+export function MoneyInExchangeRateField() {
+  const { account } = useMoneyInFieldsContext();
+  const { values } = useFormikContext();
+
+  const isForeigAccount = useForeignAccount();
+
+  if (!isForeigAccount) return null;
+
+  return (
+    <ExchangeRateMutedField
+      name={'exchange_rate'}
+      fromCurrency={values.currency_code}
+      toCurrency={account.currency_code}
+      formGroupProps={{ label: '', inline: false }}
+      date={values.date}
+      exchangeRate={values.exchange_rate}
+    />
+  );
+}

packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFieldsProvider.tsx

@@ -0,0 +1,34 @@
+// @ts-nocheck
+import React from 'react';
+import { DialogContent } from '@/components';
+import { useAccount } from '@/hooks/query';
+import { useMoneyInDailogContext } from './MoneyInDialogProvider';
+
+const MoneyInFieldsContext = React.createContext();
+
+/**
+ * Money in dialog provider.
+ */
+function MoneyInFieldsProvider({ ...props }) {
+  const { accountId } = useMoneyInDailogContext();
+
+  // Fetches the specific account details.
+  const { data: account, isLoading: isAccountLoading } = useAccount(accountId, {
+    enabled: !!accountId,
+  });
+  // Provider data.
+  const provider = {
+    account,
+  };
+  const isLoading = isAccountLoading;
+
+  return (
+    <DialogContent isLoading={isLoading}>
+      <MoneyInFieldsContext.Provider value={provider} {...props} />
+    </DialogContent>
+  );
+}
+
+const useMoneyInFieldsContext = () => React.useContext(MoneyInFieldsContext);
+
+export { MoneyInFieldsProvider, useMoneyInFieldsContext };

packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInForm.tsx

@@ -53,7 +53,6 @@ function MoneyInForm({
     accountId,
     accountType,
     createCashflowTransactionMutate,
-    submitPayload,
   } = useMoneyInDailogContext();
 
   // transaction number.
@@ -61,7 +60,6 @@ function MoneyInForm({
     transactionNumberPrefix,
     transactionNextNumber,
   );
-
   // Initial form values.
   const initialValues = {
     ...defaultInitialValues,
@@ -95,15 +93,13 @@ function MoneyInForm({
   };
 
   return (
-    <div>
+    <Formik
-      <Formik
+      validationSchema={CreateMoneyInFormSchema}
-        validationSchema={CreateMoneyInFormSchema}
+      initialValues={initialValues}
-        initialValues={initialValues}
+      onSubmit={handleFormSubmit}
-        onSubmit={handleFormSubmit}
+    >
-      >
+      <MoneyInFormContent />
-        <MoneyInFormContent />
+    </Formik>
-      </Formik>
-    </div>
   );
 }
 

packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFormFields.tsx

@@ -12,17 +12,13 @@ import { useMoneyInDailogContext } from './MoneyInDialogProvider';
  * Money in form fields.
  */
 function MoneyInFormFields() {
-  const { values } = useFormikContext();
-
   // Money in dialog context.
-  const { accountId } = useMoneyInDailogContext();
+  const { defaultAccountId } = useMoneyInDailogContext();
 
   return (
     <div className={Classes.DIALOG_BODY}>
-      <If condition={!accountId}>
+      {!defaultAccountId && <TransactionTypeFields />}
-        <TransactionTypeFields />
+      <MoneyInContentFields />
-      </If>
-      <MoneyInContentFields accountType={values.transaction_type} />
     </div>
   );
 }

packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx

@@ -1,10 +1,9 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
 import {
   Classes,
   FormGroup,
-  InputGroup,
   TextArea,
   Position,
   ControlGroup,
@@ -18,14 +17,15 @@ import {
   FieldRequiredHint,
   Col,
   Row,
-  If,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
-  ExchangeRateMutedField,
+  FInputGroup,
+  FFormGroup,
+  FTextArea,
+  FMoneyInputGroup,
 } from '@/components';
 import { DateInput } from '@blueprintjs/datetime';
-import { useAutofocus } from '@/hooks';
 import { CLASSES, ACCOUNT_TYPE, Features } from '@/constants';
 
 import {
@@ -36,22 +36,18 @@ import {
 } from '@/utils';
 
 import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
-import {
+import { useSetPrimaryBranchToForm, BranchRowDivider } from '../utils';
-  useSetPrimaryBranchToForm,
-  useForeignAccount,
-  BranchRowDivider,
-} from '../utils';
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { useMoneyInFieldsContext } from '../MoneyInFieldsProvider';
+import { MoneyInExchangeRateField } from '../MoneyInExchangeRateField';
 
 /**
  * Other income form fields.
  */
 export default function OtherIncomeFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyInDailogContext();
+  const { accounts, branches } = useMoneyInDailogContext();
-  const { values } = useFormikContext();
+  const { account } = useMoneyInFieldsContext();
-  const amountFieldRef = useAutofocus();
-  const isForeigAccount = useForeignAccount();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -61,17 +57,14 @@ export default function OtherIncomeFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
+            <FFormGroup name={'amount'} label={<T id={'branch'} />}>
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
@@ -106,53 +99,32 @@ export default function OtherIncomeFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Transaction number -----------*/}
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
+
-      <FastField name={'amount'}>
+      {/*------------ Amount -----------*/}
-        {({
+      <Row>
-          form: { values, setFieldValue },
+        <Col xs={10}>
-          field: { value },
+          <FFormGroup
-          meta: { error, touched },
+            name={'amount'}
-        }) => (
-          <FormGroup
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
               <InputPrependText text={account.currency_code} />
-
+              <FMoneyInputGroup name={'amount'} minimal={true} />
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
             </ControlGroup>
-          </FormGroup>
+          </FFormGroup>
-        )}
+        </Col>
-      </FastField>
+      </Row>
+
+      {/*------------ Exchange rate -----------*/}
+      <MoneyInExchangeRateField />
 
-      <If condition={isForeigAccount}>
-        {/*------------ exchange rate -----------*/}
-        <ExchangeRateMutedField
-          name={'exchange_rate'}
-          fromCurrency={values.currency_code}
-          toCurrency={account.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
       <Row>
         <Col xs={5}>
           {/*------------ other income account -----------*/}
@@ -182,43 +154,24 @@ export default function OtherIncomeFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
+          <FFormGroup label={<T id={'reference_no'} />} name={'reference_no'}>
-            {({ form, field, meta: { error, touched } }) => (
+            <FInputGroup name={'reference_no'} />
-              <FormGroup
+          </FFormGroup>
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
         </Col>
       </Row>
-      {/*------------ description -----------*/}
+
-      <FastField name={'description'}>
+      {/*------------ Description -----------*/}
-        {({ field, meta: { error, touched } }) => (
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
-          <FormGroup
+        <FTextArea
-            label={<T id={'description'} />}
+          name={'description'}
-            className={'form-group--description'}
+          growVertically={true}
-            intent={inputIntent({ error, touched })}
+          large={true}
-            helperText={<ErrorMessage name={'description'} />}
+          fill={true}
-          >
+        />
-            <TextArea
+      </FFormGroup>
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
     </React.Fragment>
   );
 }

packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx

@@ -1,32 +1,24 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
-import {
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
 import classNames from 'classnames';
-
+import { DateInput } from '@blueprintjs/datetime';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
   Col,
   Row,
-  If,
-  ExchangeRateMutedField,
   BranchSelect,
   BranchSelectButton,
   FeatureCan,
+  FFormGroup,
+  FMoneyInputGroup,
+  FTextArea,
+  FInputGroup,
 } from '@/components';
-import { DateInput } from '@blueprintjs/datetime';
-import { useAutofocus } from '@/hooks';
 import { ACCOUNT_TYPE, CLASSES, Features } from '@/constants';
 import {
   inputIntent,
@@ -37,10 +29,11 @@ import {
 import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
 import {
   useSetPrimaryBranchToForm,
-  useForeignAccount,
   BranchRowDivider,
 } from '../../MoneyInDialog/utils';
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { useMoneyInFieldsContext } from '../MoneyInFieldsProvider';
+import { MoneyInExchangeRateField } from '../MoneyInExchangeRateField';
 
 /**
 /**
@@ -48,13 +41,8 @@ import { MoneyInOutTransactionNoField } from '../../_components';
  */
 export default function OwnerContributionFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyInDailogContext();
+  const { accounts, branches } = useMoneyInDailogContext();
-
+  const { account } = useMoneyInFieldsContext();
-  const { values } = useFormikContext();
-
-  const amountFieldRef = useAutofocus();
-
-  const isForeigAccount = useForeignAccount();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -64,21 +52,19 @@ export default function OwnerContributionFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
+            <FFormGroup name={'branch_id'} label={<T id={'branch'} />}>
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
       </FeatureCan>
+
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -113,47 +99,26 @@ export default function OwnerContributionFormFields() {
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
+
-      <Field name={'amount'}>
+      {/*------------ Amount -----------*/}
-        {({
+      <Row>
-          form: { values, setFieldValue },
+        <Col xs={10}>
-          field: { value },
+          <FFormGroup
-          meta: { error, touched },
+            name={'amount'}
-        }) => (
-          <FormGroup
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
-              <InputPrependText text={account?.currency_code} />
+              <InputPrependText text={account?.currency_code || '--'} />
-
+              <FMoneyInputGroup name={'amount'} minimal={true} />
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
             </ControlGroup>
-          </FormGroup>
+          </FFormGroup>
-        )}
+        </Col>
-      </Field>
+      </Row>
-      <If condition={isForeigAccount}>
+
-        {/*------------ exchange rate -----------*/}
+      {/*------------ Exchange rate -----------*/}
-        <ExchangeRateMutedField
+      <MoneyInExchangeRateField />
-          name={'exchange_rate'}
+
-          fromCurrency={values.currency_code}
-          toCurrency={account.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
       <Row>
         <Col xs={5}>
           {/*------------ equity account -----------*/}
@@ -181,43 +146,24 @@ export default function OwnerContributionFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
-            {({ form, field, meta: { error, touched } }) => (
+            <FInputGroup name={'reference_no'} />
-              <FormGroup
+          </FFormGroup>
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
         </Col>
       </Row>
-      {/*------------ description -----------*/}
+
-      <FastField name={'description'}>
+      {/*------------ Description -----------*/}
-        {({ field, meta: { error, touched } }) => (
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
-          <FormGroup
+        <FTextArea
-            label={<T id={'description'} />}
+          name={'description'}
-            className={'form-group--description'}
+          growVertically={true}
-            intent={inputIntent({ error, touched })}
+          large={true}
-            helperText={<ErrorMessage name={'description'} />}
+          fill={true}
-          >
+        />
-            <TextArea
+      </FFormGroup>
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
     </React.Fragment>
   );
 }

packages/webapp/src/containers/CashFlow/MoneyInDialog/TransactionTypeFields.tsx

@@ -10,6 +10,8 @@ import {
   ListSelect,
   Col,
   Row,
+  FFormGroup,
+  FSelect,
 } from '@/components';
 import { inputIntent } from '@/utils';
 import { CLASSES, getAddMoneyInOptions } from '@/constants';
@@ -21,7 +23,7 @@ import { useMoneyInDailogContext } from './MoneyInDialogProvider';
  */
 export default function TransactionTypeFields() {
   // Money in dialog context.
-  const { cashflowAccounts } = useMoneyInDailogContext();
+  const { cashflowAccounts, setAccountId } = useMoneyInDailogContext();
 
   // Retrieves the add money in button options.
   const addMoneyInOptions = useMemo(() => getAddMoneyInOptions(), []);
@@ -29,6 +31,23 @@ export default function TransactionTypeFields() {
   return (
     <div className="trasnaction-type-fileds">
       <Row>
+        <Col xs={5}>
+          {/*------------ Transaction type -----------*/}
+          <FFormGroup
+            name={'transaction_type'}
+            label={<T id={'transaction_type'} />}
+            labelInfo={<FieldRequiredHint />}
+          >
+            <FSelect
+              name={'transaction_type'}
+              items={addMoneyInOptions}
+              popoverProps={{ minimal: true }}
+              valueAccessor={'value'}
+              textAccessor={'name'}
+            />
+          </FFormGroup>
+        </Col>
+
         <Col xs={5}>
           {/*------------ Current account -----------*/}
           <FastField name={'cashflow_account_id'}>
@@ -46,9 +65,10 @@ export default function TransactionTypeFields() {
               >
                 <AccountsSuggestField
                   accounts={cashflowAccounts}
-                  onAccountSelected={({ id }) =>
+                  onAccountSelected={({ id }) => {
-                    form.setFieldValue('cashflow_account_id', id)
+                    form.setFieldValue('cashflow_account_id', id);
-                  }
+                    setAccountId(id);
+                  }}
                   inputProps={{
                     intent: inputIntent({ error, touched }),
                   }}
@@ -56,39 +76,6 @@ export default function TransactionTypeFields() {
               </FormGroup>
             )}
           </FastField>
-          {/*------------ Transaction type -----------*/}
-        </Col>
-        <Col xs={5}>
-          <Field name={'transaction_type'}>
-            {({
-              form: { values, setFieldValue },
-              field: { value },
-              meta: { error, touched },
-            }) => (
-              <FormGroup
-                label={<T id={'transaction_type'} />}
-                labelInfo={<FieldRequiredHint />}
-                helperText={<ErrorMessage name="transaction_type" />}
-                intent={inputIntent({ error, touched })}
-                className={classNames(
-                  CLASSES.FILL,
-                  'form-group--transaction_type',
-                )}
-              >
-                <ListSelect
-                  items={addMoneyInOptions}
-                  onItemSelect={(type) => {
-                    setFieldValue('transaction_type', type.value);
-                  }}
-                  filterable={false}
-                  selectedItem={value}
-                  selectedItemProp={'value'}
-                  textProp={'name'}
-                  popoverProps={{ minimal: true }}
-                />
-              </FormGroup>
-            )}
-          </Field>
         </Col>
       </Row>
     </div>

packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx

@@ -1,33 +1,27 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
 import { DateInput } from '@blueprintjs/datetime';
-import {
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
   Col,
   Row,
-  If,
-  ExchangeRateMutedField,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
+  FMoneyInputGroup,
+  FInputGroup,
+  FFormGroup,
+  FTextArea,
 } from '@/components';
-import { useAutofocus } from '@/hooks';
+import { MoneyInOutTransactionNoField } from '../../_components';
+import { MoneyInExchangeRateField } from '../MoneyInExchangeRateField';
 import { CLASSES, ACCOUNT_TYPE, Features } from '@/constants';
-
 import {
   inputIntent,
   momentFormatter,
@@ -35,25 +29,19 @@ import {
   handleDateChange,
 } from '@/utils';
 import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
+import { useMoneyInFieldsContext } from '../MoneyInFieldsProvider';
 import {
   useSetPrimaryBranchToForm,
-  useForeignAccount,
   BranchRowDivider,
 } from '../../MoneyInDialog/utils';
 
-import { MoneyInOutTransactionNoField } from '../../_components';
-
 /**
  * Transfer from account form fields.
  */
 export default function TransferFromAccountFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyInDailogContext();
+  const { accounts, branches } = useMoneyInDailogContext();
-
+  const { account } = useMoneyInFieldsContext();
-  const isForeigAccount = useForeignAccount();
-  const amountFieldRef = useAutofocus();
-
-  const { values } = useFormikContext();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -63,17 +51,14 @@ export default function TransferFromAccountFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
+            <FFormGroup label={<T id={'branch'} />} name={'branch_id'}>
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
@@ -112,50 +97,27 @@ export default function TransferFromAccountFormFields() {
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
+      {/*------------ Amount -----------*/}
-      <FastField name={'amount'}>
+      <Row>
-        {({
+        <Col xs={10}>
-          form: { values, setFieldValue },
-          field: { value },
-          meta: { error, touched },
-        }) => (
           <FormGroup
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
-              <InputPrependText text={account.currency_code} />
+              <InputPrependText text={account.currency_code || '--'} />
-
+              <FMoneyInputGroup name={'amount'} minimal={true} />
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
             </ControlGroup>
           </FormGroup>
-        )}
+        </Col>
-      </FastField>
+      </Row>
-      <If condition={isForeigAccount}>
+
-        {/*------------ exchange rate -----------*/}
+      {/*------------ Exchange rate -----------*/}
-        <ExchangeRateMutedField
+      <MoneyInExchangeRateField />
-          name={'exchange_rate'}
+
-          fromCurrency={values.currency_code}
-          toCurrency={account.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
       <Row>
         <Col xs={5}>
-          {/*------------ transfer from account -----------*/}
+          {/*------------ Transfer from account -----------*/}
           <FastField name={'credit_account_id'}>
             {({ form, field, meta: { error, touched } }) => (
               <FormGroup
@@ -185,43 +147,24 @@ export default function TransferFromAccountFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
-            {({ form, field, meta: { error, touched } }) => (
+            <FInputGroup name={'reference_no'} />
-              <FormGroup
+          </FFormGroup>
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
         </Col>
       </Row>
-      {/*------------ description -----------*/}
+
-      <FastField name={'description'}>
+      {/*------------ Description -----------*/}
-        {({ field, meta: { error, touched } }) => (
+      <FormGroup name={'description'} label={<T id={'description'} />}>
-          <FormGroup
+        <FTextArea
-            label={<T id={'description'} />}
+          name={'description'}
-            className={'form-group--description'}
+          growVertically={true}
-            intent={inputIntent({ error, touched })}
+          large={true}
-            helperText={<ErrorMessage name={'description'} />}
+          fill={true}
-          >
+        />
-            <TextArea
+      </FormGroup>
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
     </React.Fragment>
   );
 }

packages/webapp/src/containers/CashFlow/MoneyInDialog/index.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 import intl from 'react-intl-universal';
 import { Dialog, DialogSuspense } from '@/components';
 import withDialogRedux from '@/components/DialogReduxConnect';
-
 import { compose } from '@/utils';
 
 const MoneyInDialogContent = React.lazy(() => import('./MoneyInDialogContent'));

packages/webapp/src/containers/CashFlow/MoneyInDialog/utils.tsx

@@ -6,6 +6,7 @@ import { transactionNumber } from '@/utils';
 import { isEqual, isNull, first } from 'lodash';
 
 import { useMoneyInDailogContext } from './MoneyInDialogProvider';
+import { useMoneyInFieldsContext } from './MoneyInFieldsProvider';
 
 export const useObserveTransactionNoSettings = (prefix, nextNumber) => {
   const { setFieldValue } = useFormikContext();
@@ -33,7 +34,7 @@ export const useSetPrimaryBranchToForm = () => {
 
 export const useForeignAccount = () => {
   const { values } = useFormikContext();
-  const { account } = useMoneyInDailogContext();
+  const { account } = useMoneyInFieldsContext();
 
   return (
     !isEqual(account.currency_code, values.currency_code) &&

packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutContentFields.tsx

@@ -1,13 +1,22 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useMemo } from 'react';
+import { useFormikContext } from 'formik';
 
 import OtherExpnseFormFields from './OtherExpense/OtherExpnseFormFields';
 import OwnerDrawingsFormFields from './OwnerDrawings/OwnerDrawingsFormFields';
 import TransferToAccountFormFields from './TransferToAccount/TransferToAccountFormFields';
+import { MoneyOutFieldsProvider } from './MoneyOutFieldsProvider';
 
-function MoneyOutContentFields({ accountType }) {
+/**
-  const handleTransactionType = () => {
+ * Money out content fields.
-    switch (accountType) {
+ * Switches between form fields based on the given transaction type.
+ * @returns {JSX.Element}
+ */
+function MoneyOutContentFields() {
+  const { values } = useFormikContext();
+
+  const transactionType = useMemo(() => {
+    switch (values.transaction_type) {
       case 'OwnerDrawing':
         return <OwnerDrawingsFormFields />;
 
@@ -19,8 +28,12 @@ function MoneyOutContentFields({ accountType }) {
       default:
         break;
     }
-  };
+  }, [values.transaction_type]);
-  return <React.Fragment>{handleTransactionType()}</React.Fragment>;
+
+  // Cannot continue if transaction type or account is not selected.
+  if (!values.transaction_type || !values.cashflow_account_id) return null;
+
+  return <MoneyOutFieldsProvider>{transactionType}</MoneyOutFieldsProvider>;
 }
 
 export default MoneyOutContentFields;

packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutDialogProvider.tsx

@@ -1,11 +1,10 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useState } from 'react';
 import { DialogContent } from '@/components';
 import { Features } from '@/constants';
 import { useFeatureCan } from '@/hooks/state';
 import {
   useAccounts,
-  useAccount,
   useBranches,
   useCreateCashflowTransaction,
   useCashflowAccounts,
@@ -17,7 +16,15 @@ const MoneyInDialogContent = React.createContext();
 /**
  * Money out dialog provider.
  */
-function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
+function MoneyOutProvider({
+  accountId: defaultAccountId,
+  accountType,
+  dialogName,
+  ...props
+}) {
+  // Holds the selected account id of the dialog.
+  const [accountId, setAccountId] = useState<number | null>(defaultAccountId);
+
   // Features guard.
   const { featureCan } = useFeatureCan();
   const isBranchFeatureCan = featureCan(Features.Branches);
@@ -25,11 +32,6 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
   // Fetches accounts list.
   const { isLoading: isAccountsLoading, data: accounts } = useAccounts();
 
-  // Fetches the specific account details.
-  const { data: account, isLoading: isAccountLoading } = useAccount(accountId, {
-    enabled: !!accountId,
-  });
-
   // Fetches the branches list.
   const {
     data: branches,
@@ -41,6 +43,7 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
   const { data: cashflowAccounts, isLoading: isCashFlowAccountsLoading } =
     useCashflowAccounts({}, { keepPreviousData: true });
 
+  // Mutation to create a new cashflow account.
   const { mutateAsync: createCashflowTransactionMutate } =
     useCreateCashflowTransaction();
 
@@ -50,11 +53,13 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
   // Submit payload.
   const [submitPayload, setSubmitPayload] = React.useState({});
 
-  //  provider.
+  // Provider data.
   const provider = {
-    accounts,
-    account,
     accountId,
+    setAccountId,
+    defaultAccountId,
+
+    accounts,
     accountType,
     branches,
     isAccountsLoading,
@@ -69,15 +74,14 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
     setSubmitPayload,
   };
 
+  const isLoading =
+    isAccountsLoading ||
+    isCashFlowAccountsLoading ||
+    isBranchesLoading ||
+    isSettingsLoading;
+
   return (
-    <DialogContent
+    <DialogContent isLoading={isLoading}>
-      isLoading={
-        isAccountsLoading ||
-        isCashFlowAccountsLoading ||
-        isBranchesLoading ||
-        isSettingsLoading
-      }
-    >
       <MoneyInDialogContent.Provider value={provider} {...props} />
     </DialogContent>
   );

packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutExchangeRateField.tsx

@@ -0,0 +1,31 @@
+// @ts-nocheck
+import React from 'react';
+import { useFormikContext } from 'formik';
+import { useForeignAccount } from './utils';
+import { ExchangeRateMutedField } from '@/components';
+import { useMoneyOutFieldsContext } from './MoneyOutFieldsProvider';
+
+/**
+ * Money-out exchange rate field.
+ * @returns {JSX.Element}
+ */
+export function MoneyOutExchangeRateField() {
+  const { values } = useFormikContext();
+
+  const { account } = useMoneyOutFieldsContext();
+  const isForeigAccount = useForeignAccount();
+
+  // Cannot continue if the account is not foreign account.
+  if (!isForeigAccount) return null;
+
+  return (
+    <ExchangeRateMutedField
+      name={'exchange_rate'}
+      fromCurrency={values?.currency_code}
+      toCurrency={account?.currency_code}
+      formGroupProps={{ label: '', inline: false }}
+      date={values.date}
+      exchangeRate={values.exchange_rate}
+    />
+  );
+}

packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFieldsProvider.tsx

@@ -0,0 +1,34 @@
+// @ts-nocheck
+import React from 'react';
+import { DialogContent } from '@/components';
+import { useAccount } from '@/hooks/query';
+import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
+
+const MoneyOutFieldsContext = React.createContext();
+
+/**
+ * Money out fields dialog provider.
+ */
+function MoneyOutFieldsProvider({ ...props }) {
+  const { accountId } = useMoneyOutDialogContext();
+
+  // Fetches the specific account details.
+  const { data: account, isLoading: isAccountLoading } = useAccount(accountId, {
+    enabled: !!accountId,
+  });
+  // Provider data.
+  const provider = {
+    account,
+  };
+  const isLoading = isAccountLoading;
+
+  return (
+    <DialogContent isLoading={isLoading}>
+      <MoneyOutFieldsContext.Provider value={provider} {...props} />
+    </DialogContent>
+  );
+}
+
+const useMoneyOutFieldsContext = () => React.useContext(MoneyOutFieldsContext);
+
+export { MoneyOutFieldsProvider, useMoneyOutFieldsContext };

packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx

@@ -24,18 +24,16 @@ function MoneyOutFloatingActions({
     useMoneyOutDialogContext();
 
   // handle submit as draft button click.
-  const handleSubmitDraftBtnClick = (event) => {
+  const handleSubmitDraftBtnClick = () => {
     setSubmitPayload({ publish: false });
     submitForm();
   };
-
   // Handle submit  button click.
-  const handleSubmittBtnClick = (event) => {
+  const handleSubmittBtnClick = () => {
     setSubmitPayload({ publish: true });
   };
-
   // Handle close button click.
-  const handleCloseBtnClick = (event) => {
+  const handleCloseBtnClick = () => {
     closeDialog(dialogName);
   };
 
@@ -49,7 +47,7 @@ function MoneyOutFloatingActions({
         >
           <T id={'close'} />
         </Button>
-    
+
         <Button
           intent={Intent.PRIMARY}
           disabled={isSubmitting}

packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutForm.tsx

@@ -92,15 +92,13 @@ function MoneyOutForm({
       });
   };
   return (
-    <div>
+    <Formik
-      <Formik
+      validationSchema={CreateMoneyOutSchema}
-        validationSchema={CreateMoneyOutSchema}
+      initialValues={initialValues}
-        initialValues={initialValues}
+      onSubmit={handleFormSubmit}
-        onSubmit={handleFormSubmit}
+    >
-      >
+      <MoneyOutFormContent />
-        <MoneyOutFormContent />
+    </Formik>
-      </Formik>
-    </div>
   );
 }
 

packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormDialog.tsx

@@ -17,6 +17,7 @@ export default function MoneyOutFormDialog() {
     setFieldValue('transaction_number', incrementNumber || '');
     setFieldValue('transaction_number_manually', manually);
   };
+
   return (
     <React.Fragment>
       <TransactionNumberDialog

packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFormFields.tsx

@@ -1,28 +1,18 @@
 // @ts-nocheck
 import React from 'react';
-import { useFormikContext } from 'formik';
 import { Classes } from '@blueprintjs/core';
 
-import { If } from '@/components';
-
 import MoneyOutContentFields from './MoneyOutContentFields';
 import TransactionTypeFields from './TransactionTypeFields';
-import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
 
 /**
  * Money out form fields.
  */
 function MoneyOutFormFields() {
-  // Money in dialog context.
-  const { accountId } = useMoneyOutDialogContext();
-
-  const { values } = useFormikContext();
   return (
     <div className={Classes.DIALOG_BODY}>
-      <If condition={!accountId}>
+      <TransactionTypeFields />
-        <TransactionTypeFields />
+      <MoneyOutContentFields />
-      </If>
-      <MoneyOutContentFields accountType={values.transaction_type} />
     </div>
   );
 }

packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx

@@ -1,33 +1,25 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
-import {
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
   Col,
   Row,
-  If,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
-  ExchangeRateMutedField,
+  FTextArea,
+  FFormGroup,
+  FInputGroup,
+  FMoneyInputGroup,
 } from '@/components';
 import { DateInput } from '@blueprintjs/datetime';
-import { useAutofocus } from '@/hooks';
 import { Features, ACCOUNT_TYPE } from '@/constants';
-
 import {
   inputIntent,
   momentFormatter,
@@ -36,25 +28,18 @@ import {
 } from '@/utils';
 import { CLASSES } from '@/constants/classes';
 import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
-import {
+import { useSetPrimaryBranchToForm, BranchRowDivider } from '../utils';
-  useSetPrimaryBranchToForm,
-  useForeignAccount,
-  BranchRowDivider,
-} from '../utils';
-
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { MoneyOutExchangeRateField } from '../MoneyOutExchangeRateField';
+import { useMoneyOutFieldsContext } from '../MoneyOutFieldsProvider';
 
 /**
  * Other expense form fields.
  */
 export default function OtherExpnseFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyOutDialogContext();
+  const { accounts, branches } = useMoneyOutDialogContext();
-
+  const { account } = useMoneyOutFieldsContext();
-  const isForeigAccount = useForeignAccount();
-  const { values } = useFormikContext();
-
-  const amountFieldRef = useAutofocus();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -64,21 +49,19 @@ export default function OtherExpnseFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
+            <FFormGroup name={'branch_id'} label={<T id={'branch'} />}>
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
       </FeatureCan>
+
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -113,47 +96,27 @@ export default function OtherExpnseFormFields() {
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
+
       {/*------------ amount -----------*/}
-      <FastField name={'amount'}>
+
-        {({
+      <Row>
-          form: { values, setFieldValue },
+        <Col xs={10}>
-          field: { value },
+          <FFormGroup
-          meta: { error, touched },
+            name={'amount'}
-        }) => (
-          <FormGroup
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
               <InputPrependText text={account.currency_code} />
-
+              <FMoneyInputGroup name={'amount'} minimal={true} />
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
             </ControlGroup>
-          </FormGroup>
+          </FFormGroup>
-        )}
+        </Col>
-      </FastField>
+      </Row>
-      <If condition={isForeigAccount}>
+
-        {/*------------ exchange rate -----------*/}
+      {/*------------ Exchange rate -----------*/}
-        <ExchangeRateMutedField
+      <MoneyOutExchangeRateField />
-          name={'exchange_rate'}
+
-          fromCurrency={values.currency_code}
-          toCurrency={account.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
       <Row>
         <Col xs={5}>
           {/*------------ other expense account -----------*/}
@@ -183,44 +146,24 @@ export default function OtherExpnseFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
-            {({ form, field, meta: { error, touched } }) => (
+            <FInputGroup name={'reference_no'} />
-              <FormGroup
+          </FFormGroup>
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
         </Col>
       </Row>
 
       {/*------------ description -----------*/}
-      <FastField name={'description'}>
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
-        {({ field, meta: { error, touched } }) => (
+        <FTextArea
-          <FormGroup
+          name={'description'}
-            label={<T id={'description'} />}
+          growVertically={true}
-            className={'form-group--description'}
+          large={true}
-            intent={inputIntent({ error, touched })}
+          fill={true}
-            helperText={<ErrorMessage name={'description'} />}
+        />
-          >
+      </FFormGroup>
-            <TextArea
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
     </React.Fragment>
   );
 }

packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx

@@ -1,31 +1,24 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
 import { DateInput } from '@blueprintjs/datetime';
-import {
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
-  If,
   Col,
   Row,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
-  ExchangeRateMutedField,
+  FFormGroup,
+  FTextArea,
+  FInputGroup,
+  FMoneyInputGroup,
 } from '@/components';
-import { useAutofocus } from '@/hooks';
 import { CLASSES, Features, ACCOUNT_TYPE } from '@/constants';
 import {
   inputIntent,
@@ -36,21 +29,19 @@ import {
 import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
 import {
   useSetPrimaryBranchToForm,
-  useForeignAccount,
   BranchRowDivider,
 } from '../../MoneyOutDialog/utils';
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { useMoneyOutFieldsContext } from '../MoneyOutFieldsProvider';
+import { MoneyOutExchangeRateField } from '../MoneyOutExchangeRateField';
 
 /**
  * Owner drawings form fields.
  */
 export default function OwnerDrawingsFormFields() {
   // Money out dialog context.
-  const { accounts, account, branches } = useMoneyOutDialogContext();
+  const { accounts, branches } = useMoneyOutDialogContext();
-  const { values } = useFormikContext();
+  const { account } = useMoneyOutFieldsContext();
-  const isForeigAccount = useForeignAccount();
-
-  const amountFieldRef = useAutofocus();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -60,21 +51,19 @@ export default function OwnerDrawingsFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
+            <FFormGroup label={<T id={'branch'} />} name={'branch_id'}>
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
       </FeatureCan>
+
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -109,48 +98,27 @@ export default function OwnerDrawingsFormFields() {
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
+
-      <Field name={'amount'}>
+      {/*------------ Amount -----------*/}
-        {({
+
-          form: { values, setFieldValue },
+      <Row>
-          field: { value },
+        <Col xs={10}>
-          meta: { error, touched },
-        }) => (
           <FormGroup
+            name={'amount'}
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
               <InputPrependText text={account.currency_code} />
-
+              <FMoneyInputGroup name={'amount'} minimal={true} />
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={(ref) => (amountFieldRef.current = ref)}
-                intent={inputIntent({ error, touched })}
-              />
             </ControlGroup>
           </FormGroup>
-        )}
+        </Col>
-      </Field>
+      </Row>
+
+      {/*------------ Exchange rate -----------*/}
+      <MoneyOutExchangeRateField />
 
-      <If condition={isForeigAccount}>
-        {/*------------ exchange rate -----------*/}
-        <ExchangeRateMutedField
-          name={'exchange_rate'}
-          fromCurrency={values?.currency_code}
-          toCurrency={account?.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
       <Row>
         <Col xs={5}>
           {/*------------ equitty account -----------*/}
@@ -177,44 +145,24 @@ export default function OwnerDrawingsFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
-            {({ form, field, meta: { error, touched } }) => (
+            <FInputGroup name={'reference_no'} />
-              <FormGroup
+          </FFormGroup>
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
         </Col>
       </Row>
 
       {/*------------ description -----------*/}
-      <FastField name={'description'}>
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
-        {({ field, meta: { error, touched } }) => (
+        <FTextArea
-          <FormGroup
+          name={'description'}
-            label={<T id={'description'} />}
+          growVertically={true}
-            className={'form-group--description'}
+          large={true}
-            intent={inputIntent({ error, touched })}
+          fill={true}
-            helperText={<ErrorMessage name={'description'} />}
+        />
-          >
+      </FFormGroup>
-            <TextArea
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
     </React.Fragment>
   );
 }

packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransactionTypeFields.tsx

@@ -1,22 +1,21 @@
 // @ts-nocheck
 import React, { useMemo } from 'react';
-import { FastField, Field, ErrorMessage } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
 import { FormGroup } from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   FieldRequiredHint,
-  ListSelect,
   Col,
   Row,
+  FSelect,
+  FFormGroup,
 } from '@/components';
-
 import { inputIntent } from '@/utils';
-import { CLASSES } from '@/constants/classes';
 import { getAddMoneyOutOptions } from '@/constants/cashflowOptions';
-
 import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
+import { CLASSES } from '@/constants/classes';
 
 /**
  * Transaction type fields.
@@ -27,9 +26,32 @@ function TransactionTypeFields() {
 
   const addMoneyOutOptions = useMemo(() => getAddMoneyOutOptions(), []);
 
+  // Money in dialog context.
+  const { defaultAccountId, setAccountId } = useMoneyOutDialogContext();
+
+  // Cannot continue if the default account id is defined.
+  if (defaultAccountId) return null;
+
   return (
     <div className="trasnaction-type-fileds">
       <Row>
+        {/*------------ Transaction type -----------*/}
+        <Col xs={5}>
+          <FFormGroup
+            name={'transaction_type'}
+            label={<T id={'transaction_type'} />}
+            labelInfo={<FieldRequiredHint />}
+          >
+            <FSelect
+              name={'transaction_type'}
+              items={addMoneyOutOptions}
+              popoverProps={{ minimal: true }}
+              valueAccessor={'value'}
+              textAccessor={'name'}
+            />
+          </FFormGroup>
+        </Col>
+
         <Col xs={5}>
           {/*------------ Current account -----------*/}
           <FastField name={'cashflow_account_id'}>
@@ -47,9 +69,10 @@ function TransactionTypeFields() {
               >
                 <AccountsSuggestField
                   accounts={cashflowAccounts}
-                  onAccountSelected={({ id }) =>
+                  onAccountSelected={({ id }) => {
-                    form.setFieldValue('cashflow_account_id', id)
+                    form.setFieldValue('cashflow_account_id', id);
-                  }
+                    setAccountId(id);
+                  }}
                   inputProps={{
                     intent: inputIntent({ error, touched }),
                   }}
@@ -57,39 +80,6 @@ function TransactionTypeFields() {
               </FormGroup>
             )}
           </FastField>
-          {/*------------ Transaction type -----------*/}
-        </Col>
-        <Col xs={5}>
-          <Field name={'transaction_type'}>
-            {({
-              form: { values, setFieldValue },
-              field: { value },
-              meta: { error, touched },
-            }) => (
-              <FormGroup
-                label={<T id={'transaction_type'} />}
-                labelInfo={<FieldRequiredHint />}
-                helperText={<ErrorMessage name="transaction_type" />}
-                intent={inputIntent({ error, touched })}
-                className={classNames(
-                  CLASSES.FILL,
-                  'form-group--transaction_type',
-                )}
-              >
-                <ListSelect
-                  items={addMoneyOutOptions}
-                  onItemSelect={(type) => {
-                    setFieldValue('transaction_type', type.value);
-                  }}
-                  filterable={false}
-                  selectedItem={value}
-                  selectedItemProp={'value'}
-                  textProp={'name'}
-                  popoverProps={{ minimal: true }}
-                />
-              </FormGroup>
-            )}
-          </Field>
         </Col>
       </Row>
     </div>

packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx

@@ -1,65 +1,46 @@
 // @ts-nocheck
 import React from 'react';
-import { FastField, Field, ErrorMessage, useFormikContext } from 'formik';
+import { FastField, ErrorMessage } from 'formik';
-import {
+import { FormGroup, Position, ControlGroup } from '@blueprintjs/core';
-  Classes,
-  FormGroup,
-  InputGroup,
-  TextArea,
-  Position,
-  ControlGroup,
-} from '@blueprintjs/core';
 import classNames from 'classnames';
 import {
   FormattedMessage as T,
   AccountsSuggestField,
   InputPrependText,
-  MoneyInputGroup,
   FieldRequiredHint,
-  Icon,
   Col,
   Row,
-  If,
-  InputPrependButton,
   FeatureCan,
   BranchSelect,
   BranchSelectButton,
-  ExchangeRateMutedField,
+  FFormGroup,
+  FTextArea,
+  FMoneyInputGroup,
+  FInputGroup,
 } from '@/components';
 import { DateInput } from '@blueprintjs/datetime';
-import { useAutofocus } from '@/hooks';
 import { ACCOUNT_TYPE } from '@/constants/accountTypes';
-
 import {
   inputIntent,
   momentFormatter,
   tansformDateValue,
   handleDateChange,
-  compose,
 } from '@/utils';
 import { Features } from '@/constants';
 import { CLASSES } from '@/constants/classes';
 import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
-import {
+import { useSetPrimaryBranchToForm, BranchRowDivider } from '../utils';
-  useObserveTransactionNoSettings,
-  useSetPrimaryBranchToForm,
-  useForeignAccount,
-  BranchRowDivider,
-} from '../utils';
-import withSettings from '@/containers/Settings/withSettings';
-import withDialogActions from '@/containers/Dialog/withDialogActions';
 import { MoneyInOutTransactionNoField } from '../../_components';
+import { MoneyOutExchangeRateField } from '../MoneyOutExchangeRateField';
+import { useMoneyOutFieldsContext } from '../MoneyOutFieldsProvider';
 
 /**
  * Transfer to account form fields.
  */
 export default function TransferToAccountFormFields() {
   // Money in dialog context.
-  const { accounts, account, branches } = useMoneyOutDialogContext();
+  const { accounts, branches } = useMoneyOutDialogContext();
-  const { values } = useFormikContext();
+  const { account } = useMoneyOutFieldsContext();
-  const isForeigAccount = useForeignAccount();
-
-  const accountRef = useAutofocus();
 
   // Sets the primary branch to form.
   useSetPrimaryBranchToForm();
@@ -69,21 +50,19 @@ export default function TransferToAccountFormFields() {
       <FeatureCan feature={Features.Branches}>
         <Row>
           <Col xs={5}>
-            <FormGroup
+            <FFormGroup label={<T id={'branch'} />} name={'branch_id'}>
-              label={<T id={'branch'} />}
-              className={classNames('form-group--select-list', Classes.FILL)}
-            >
               <BranchSelect
                 name={'branch_id'}
                 branches={branches}
                 input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
-            </FormGroup>
+            </FFormGroup>
           </Col>
         </Row>
         <BranchRowDivider />
       </FeatureCan>
+
       <Row>
         <Col xs={5}>
           {/*------------ Date -----------*/}
@@ -113,52 +92,32 @@ export default function TransferToAccountFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Transaction number -----------*/}
           <MoneyInOutTransactionNoField />
         </Col>
       </Row>
-      {/*------------ amount -----------*/}
+
-      <FastField name={'amount'}>
+      {/*------------ Amount -----------*/}
-        {({
+      <Row>
-          form: { values, setFieldValue },
+        <Col xs={10}>
-          field: { value },
+          <FFormGroup
-          meta: { error, touched },
+            name={'amount'}
-        }) => (
-          <FormGroup
             label={<T id={'amount'} />}
             labelInfo={<FieldRequiredHint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name="amount" />}
-            className={'form-group--amount'}
           >
             <ControlGroup>
               <InputPrependText text={account.currency_code} />
-
+              <FMoneyInputGroup name={'amount'} minimal={true} />
-              <MoneyInputGroup
-                value={value}
-                minimal={true}
-                onChange={(amount) => {
-                  setFieldValue('amount', amount);
-                }}
-                inputRef={accountRef}
-                intent={inputIntent({ error, touched })}
-              />
             </ControlGroup>
-          </FormGroup>
+          </FFormGroup>
-        )}
+        </Col>
-      </FastField>
+      </Row>
-      <If condition={isForeigAccount}>
+
-        {/*------------ exchange rate -----------*/}
+      {/*------------ Exchange rate -----------*/}
-        <ExchangeRateMutedField
+      <MoneyOutExchangeRateField />
-          name={'exchange_rate'}
+
-          fromCurrency={values?.currency_code}
-          toCurrency={account?.currency_code}
-          formGroupProps={{ label: '', inline: false }}
-          date={values.date}
-          exchangeRate={values.exchange_rate}
-        />
-      </If>
       <Row>
         <Col xs={5}>
           {/*------------ transfer from account -----------*/}
@@ -191,43 +150,24 @@ export default function TransferToAccountFormFields() {
             )}
           </FastField>
         </Col>
+
         <Col xs={5}>
           {/*------------ Reference -----------*/}
-          <FastField name={'reference_no'}>
+          <FFormGroup name={'reference_no'} label={<T id={'reference_no'} />}>
-            {({ form, field, meta: { error, touched } }) => (
+            <FInputGroup name={'reference_no'} />
-              <FormGroup
+          </FFormGroup>
-                label={<T id={'reference_no'} />}
-                intent={inputIntent({ error, touched })}
-                helperText={<ErrorMessage name="reference_no" />}
-                className={'form-group--reference-no'}
-              >
-                <InputGroup
-                  intent={inputIntent({ error, touched })}
-                  {...field}
-                />
-              </FormGroup>
-            )}
-          </FastField>
         </Col>
       </Row>
-      {/*------------ description -----------*/}
+
-      <FastField name={'description'}>
+      {/*------------ Description -----------*/}
-        {({ field, meta: { error, touched } }) => (
+      <FFormGroup name={'description'} label={<T id={'description'} />}>
-          <FormGroup
+        <FTextArea
-            label={<T id={'description'} />}
+          name={'description'}
-            className={'form-group--description'}
+          growVertically={true}
-            intent={inputIntent({ error, touched })}
+          large={true}
-            helperText={<ErrorMessage name={'description'} />}
+          fill={true}
-          >
+        />
-            <TextArea
+      </FFormGroup>
-              growVertically={true}
-              large={true}
-              intent={inputIntent({ error, touched })}
-              {...field}
-            />
-          </FormGroup>
-        )}
-      </FastField>
     </React.Fragment>
   );
 }

packages/webapp/src/containers/CashFlow/MoneyOutDialog/utils.tsx

@@ -6,6 +6,7 @@ import { transactionNumber } from '@/utils';
 import { first, isEqual, isNull } from 'lodash';
 
 import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
+import { useMoneyOutFieldsContext } from './MoneyOutFieldsProvider';
 
 export const useObserveTransactionNoSettings = (prefix, nextNumber) => {
   const { setFieldValue } = useFormikContext();
@@ -33,7 +34,7 @@ export const useSetPrimaryBranchToForm = () => {
 
 export const useForeignAccount = () => {
   const { values } = useFormikContext();
-  const { account } = useMoneyOutDialogContext();
+  const { account } = useMoneyOutFieldsContext();
 
   return (
     !isEqual(account.currency_code, values.currency_code) &&

packages/webapp/src/containers/CashFlow/_components.tsx

@@ -38,11 +38,11 @@ export const MoneyInOutSyncIncrementSettingsToForm = R.compose(
       // Do not update if the invoice auto-increment is disabled.
       if (!transactionAutoIncrement) return null;
 
-      const transactionNumber = transactionNumber(
+      const newTransactionNumber = transactionNumber(
         transactionNumberPrefix,
         transactionNextNumber,
       );
-      setFieldValue('transaction_number', transactionNumber);
+      setFieldValue('transaction_number', newTransactionNumber);
     }, [setFieldValue, transactionNumberPrefix, transactionNextNumber]);
 
     return null;

packages/webapp/src/containers/Customers/CustomerForm/CustomerFinancialPanel.tsx

@@ -10,7 +10,6 @@ import {
   InputPrependText,
   CurrencySelectList,
   BranchSelect,
-  BranchSelectButton,
   FeatureCan,
   Row,
   Col,
@@ -78,12 +77,10 @@ export default function CustomerFinancialPanel() {
               label={<T id={'customer.label.opening_branch'} />}
               name={'opening_balance_branch_id'}
               inline={true}
-              className={classNames('form-group--select-list', Classes.FILL)}
             >
               <BranchSelect
                 name={'opening_balance_branch_id'}
                 branches={branches}
-                input={BranchSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FFormGroup>

packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogFields.tsx

@@ -23,7 +23,6 @@ import {
   BranchSelect,
   WarehouseSelect,
   BranchSelectButton,
-  WarehouseSelectButton,
   AccountsSuggestField,
 } from '@/components';
 import {
@@ -34,16 +33,17 @@ import {
   toSafeNumber,
 } from '@/utils';
 import { Features, CLASSES } from '@/constants';
-import adjustmentType from '@/constants/adjustmentType';
 
 import { useInventoryAdjContext } from './InventoryAdjustmentFormProvider';
+import { useFeatureCan } from '@/hooks/state';
+
+import InventoryAdjustmentQuantityFields from './InventoryAdjustmentQuantityFields';
 import {
   diffQuantity,
   useSetPrimaryBranchToForm,
   useSetPrimaryWarehouseToForm,
+  useGetAdjustmentTypeOptions,
 } from './utils';
-import { useFeatureCan } from '@/hooks/state';
-import InventoryAdjustmentQuantityFields from './InventoryAdjustmentQuantityFields';
 
 /**
  * Inventory adjustment form dialogs fields.
@@ -52,6 +52,9 @@ export default function InventoryAdjustmentFormDialogFields() {
   // Features guard.
   const { featureCan } = useFeatureCan();
 
+  // Retrieves memorized adjustment types options.
+  const adjustmentTypes = useGetAdjustmentTypeOptions();
+
   const dateFieldRef = useAutofocus();
 
   // Inventory adjustment dialog context.
@@ -90,7 +93,6 @@ export default function InventoryAdjustmentFormDialogFields() {
               <WarehouseSelect
                 name={'warehouse_id'}
                 warehouses={warehouses}
-                input={WarehouseSelectButton}
                 popoverProps={{ minimal: true }}
               />
             </FormGroup>
@@ -149,7 +151,7 @@ export default function InventoryAdjustmentFormDialogFields() {
                 className={classNames(CLASSES.FILL, 'form-group--type')}
               >
                 <ListSelect
-                  items={adjustmentType}
+                  items={adjustmentTypes}
                   onItemSelect={(type) => {
                     const result = diffQuantity(
                       toSafeNumber(values.quantity),

packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/utils.tsx

@@ -1,5 +1,6 @@
 // @ts-nocheck
-import React from 'react';
+import React, { useMemo } from 'react';
+import intl from 'react-intl-universal';
 import { useFormikContext } from 'formik';
 import { useInventoryAdjContext } from './InventoryAdjustmentFormProvider';
 import { first } from 'lodash';
@@ -48,3 +49,12 @@ export const useSetPrimaryBranchToForm = () => {
     }
   }, [isBranchesSuccess, setFieldValue, branches]);
 };
+
+export const getAdjustmentTypeOptions = () => [
+  { name: intl.get('decrement'), value: 'decrement' },
+  { name: intl.get('increment'), value: 'increment' },
+];
+
+export const useGetAdjustmentTypeOptions = () => {
+  return useMemo(() => getAdjustmentTypeOptions(), []);
+};

packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx

@@ -7,6 +7,7 @@ import { Intent } from '@blueprintjs/core';
 import { AppToaster } from '@/components';
 import { useFormikContext } from 'formik';
 import { useQuickPaymentMadeContext } from './QuickPaymentMadeFormProvider';
+import { PAYMENT_MADE_ERRORS } from '@/containers/Purchases/PaymentMades/constants';
 
 // Default initial values of payment made.
 export const defaultPaymentMade = {
@@ -24,16 +25,16 @@ export const defaultPaymentMade = {
 export const transformErrors = (errors, { setFieldError }) => {
   const getError = (errorType) => errors.find((e) => e.type === errorType);
 
-  if (getError('PAYMENT.NUMBER.NOT.UNIQUE')) {
+  if (getError(PAYMENT_MADE_ERRORS.PAYMENT_NUMBER_NOT_UNIQUE)) {
     setFieldError('payment_number', intl.get('payment_number_is_not_unique'));
   }
-  if (getError('INVALID_BILL_PAYMENT_AMOUNT')) {
+  if (getError(PAYMENT_MADE_ERRORS.INVALID_BILL_PAYMENT_AMOUNT)) {
     setFieldError(
       'payment_amount',
       intl.get('the_payment_amount_bigger_than_invoice_due_amount'),
     );
   }
-  if (getError('WITHDRAWAL_ACCOUNT_CURRENCY_INVALID')) {
+  if (getError(PAYMENT_MADE_ERRORS.WITHDRAWAL_ACCOUNT_CURRENCY_INVALID)) {
     AppToaster.show({
       message: intl.get(
         'payment_made.error.withdrawal_account_currency_invalid',

packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerDetails.tsx

@@ -1,12 +1,13 @@
 // @ts-nocheck
 import React from 'react';
 
-import { Card } from '@/components';
+import { Card, CommercialDocBox } from '@/components';
 
 import CashflowTransactionDrawerActionBar from './CashflowTransactionDrawerActionBar';
 import CashflowTransactionDrawerHeader from './CashflowTransactionDrawerHeader';
 import CashflowTransactionDrawerTable from './CashflowTransactionDrawerTable';
-import CashflowTransactionDrawerFooter from './CashflowTransactionDrawerFooter';
+import CashflowTransactionDrawerTableFooter from './CashflowTransactionDrawerTableFooter';
+import { CashflowTransactionDrawerFooter } from './CashflowTransactionDrawerFooter';
 /**
  * Cashflow transaction view details.
  */
@@ -16,11 +17,12 @@ export default function CashflowTransactionDrawerDetails() {
       <CashflowTransactionDrawerActionBar />
 
       <div className="cashflow-drawer__content">
-        <Card>
+        <CommercialDocBox>
           <CashflowTransactionDrawerHeader />
           <CashflowTransactionDrawerTable />
+          <CashflowTransactionDrawerTableFooter />
           <CashflowTransactionDrawerFooter />
-        </Card>
+        </CommercialDocBox>
       </div>
     </div>
   );

packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx

@@ -1,35 +1,18 @@
 // @ts-nocheck
 import React from 'react';
+import { CommercialDocFooter, DetailsMenu, DetailItem, T } from '@/components';
 import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider';
-import { T, FormatNumber } from '@/components';
 
-export default function CashflowTransactionDrawerFooter() {
+export function CashflowTransactionDrawerFooter() {
-  const {
+  const { cashflowTransaction } = useCashflowTransactionDrawerContext();
-    cashflowTransaction: { formatted_amount },
-  } = useCashflowTransactionDrawerContext();
 
   return (
-    <div className="cashflow-drawer__content-footer">
+    <CommercialDocFooter>
-      <div class="total-lines">
+      <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
-        <div class="total-lines__line total-lines__line--subtotal">
+        <DetailItem label={<T id={'cash_flow.drawer.label.statement'} />}>
-          <div class="title">
+          {cashflowTransaction.description}
-            <T id={'manual_journal.details.subtotal'} />
+        </DetailItem>
-          </div>
+      </DetailsMenu>
-          <div class="debit">
+    </CommercialDocFooter>
-            <FormatNumber value={formatted_amount} />
-          </div>
-          <div class="credit">
-            <FormatNumber value={formatted_amount} />
-          </div>
-        </div>
-        <div class="total-lines__line total-lines__line--total">
-          <div class="title">
-            <T id={'manual_journal.details.total'} />
-          </div>
-          <div class="debit">{formatted_amount}</div>
-          <div class="credit">{formatted_amount}</div>
-        </div>
-      </div>
-    </div>
   );
 }

packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerTableFooter.tsx

@@ -0,0 +1,35 @@
+// @ts-nocheck
+import React from 'react';
+import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider';
+import { T, FormatNumber } from '@/components';
+
+export default function CashflowTransactionDrawerTableFooter() {
+  const {
+    cashflowTransaction: { formatted_amount },
+  } = useCashflowTransactionDrawerContext();
+
+  return (
+    <div className="cashflow-drawer__content-footer">
+      <div class="total-lines">
+        <div class="total-lines__line total-lines__line--subtotal">
+          <div class="title">
+            <T id={'manual_journal.details.subtotal'} />
+          </div>
+          <div class="debit">
+            <FormatNumber value={formatted_amount} />
+          </div>
+          <div class="credit">
+            <FormatNumber value={formatted_amount} />
+          </div>
+        </div>
+        <div class="total-lines__line total-lines__line--total">
+          <div class="title">
+            <T id={'manual_journal.details.total'} />
+          </div>
+          <div class="debit">{formatted_amount}</div>
+          <div class="credit">{formatted_amount}</div>
+        </div>
+      </div>
+    </div>
+  );
+}

packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx

@@ -1,6 +1,5 @@
 // @ts-nocheck
 import React from 'react';
-
 import {
   CommercialDocFooter,
   T,

packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsBar.tsx

@@ -21,6 +21,7 @@ import {
   FormattedMessage as T,
   Can,
 } from '@/components';
+import { ItemDetailActionsMoreBtn } from './ItemDetailActionsMoreBtn';
 
 import { compose } from '@/utils';
 import { DRAWERS } from '@/constants/drawers';
@@ -72,6 +73,7 @@ function ItemDetailActionsBar({
             onClick={handleDeleteItem}
           />
         </Can>
+        <ItemDetailActionsMoreBtn />
       </NavbarGroup>
     </DashboardActionsBar>
   );

packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsMoreBtn.tsx

@@ -0,0 +1,64 @@
+// @ts-nocheck
+import React from 'react';
+import * as R from 'ramda';
+import { Can, Icon, T } from '@/components';
+import {
+  Button,
+  Menu,
+  MenuItem,
+  Popover,
+  PopoverInteractionKind,
+  Position,
+} from '@blueprintjs/core';
+import {
+  AbilitySubject,
+  InventoryAdjustmentAction,
+} from '@/constants/abilityOption';
+import { useItemDetailDrawerContext } from './ItemDetailDrawerProvider';
+import withDialogActions from '@/containers/Dialog/withDialogActions';
+
+/**
+ * Invoice details more actions menu.
+ * @returns {React.JSX}
+ */
+export const ItemDetailActionsMoreBtn = R.compose(withDialogActions)(
+  ({
+    //#withDialogActions,
+    openDialog,
+  }) => {
+    const { itemId, item } = useItemDetailDrawerContext();
+
+    // Cannot continue if the item type is not inventory.
+    if (item.type !== 'inventory') return null;
+
+    const handleInventoryAdjustment = () => {
+      openDialog('inventory-adjustment', { itemId });
+    };
+
+    return (
+      <Popover
+        minimal={true}
+        interactionKind={PopoverInteractionKind.CLICK}
+        position={Position.BOTTOM_LEFT}
+        modifiers={{
+          offset: { offset: '0, 4' },
+        }}
+        content={
+          <Menu>
+            <Can
+              I={InventoryAdjustmentAction.Edit}
+              a={AbilitySubject.InventoryAdjustment}
+            >
+              <MenuItem
+                text={<T id={'item.view_drawer.make_adjustment'} />}
+                onClick={handleInventoryAdjustment}
+              />
+            </Can>
+          </Menu>
+        }
+      >
+        <Button icon={<Icon icon="more-vert" iconSize={16} />} minimal={true} />
+      </Popover>
+    );
+  },
+);

packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/QuickCreateItemDrawerContent.tsx

@@ -4,9 +4,8 @@ import {
   DrawerHeaderContent,
   DrawerBody,
   FormattedMessage as T,
-  Drawer,
 } from '@/components';
-
+import { DRAWERS } from '@/constants/drawers';
 import QuickCreateItemDrawerForm from './QuickCreateItemDrawerForm';
 
 /**
@@ -16,7 +15,7 @@ export default function QuickCreateItemDrawerContent({ itemName }) {
   return (
     <React.Fragment>
       <DrawerHeaderContent
-        name={DRAWER.QUICK_CREATE_ITEM}
+        name={DRAWERS.QUICK_CREATE_ITEM}
         title={<T id={'create_a_new_item'} />}
       />
       <DrawerBody>

packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/QuickCreateItemDrawerForm.tsx

@@ -17,16 +17,6 @@ import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
 import { useDrawerContext } from '@/components/Drawer/DrawerProvider';
 import { DRAWERS } from '@/constants/drawers';
 
-/**
- * Drawer item form loading.
- * @returns {JSX}
- */
-function DrawerItemFormLoading({ children }) {
-  const { isFormLoading } = useItemFormContext();
-
-  return <DrawerLoading loading={isFormLoading}>{children}</DrawerLoading>;
-}
-
 /**
  * Quick create/edit item drawer form.
  */
@@ -72,6 +62,16 @@ function QuickCreateItemDrawerForm({
   );
 }
 
+/**
+ * Drawer item form loading.
+ * @returns {JSX}
+ */
+function DrawerItemFormLoading({ children }) {
+  const { isFormLoading } = useItemFormContext();
+
+  return <DrawerLoading loading={isFormLoading}>{children}</DrawerLoading>;
+}
+
 export default R.compose(
   withDrawerActions,
   withDashboardActions,
@@ -79,10 +79,15 @@ export default R.compose(
 
 const ItemFormCard = styled(Card)`
   margin: 15px;
+  padding: 25px;
   margin-bottom: calc(15px + 65px);
 
-  .page-form__floating-actions {
+  .page-form {
-    margin-left: -36px;
+    padding: 0;
-    margin-right: -36px;
+
+    &__floating-actions {
+      margin-left: -41px;
+      margin-right: -41px;
+    }
   }
 `;

packages/webapp/src/containers/Entries/components.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import intl from 'react-intl-universal';
-import { MenuItem, Menu, Button, Position } from '@blueprintjs/core';
+import { MenuItem, Menu, Button, Position, Intent } from '@blueprintjs/core';
 import { Popover2 } from '@blueprintjs/popover2';
 
 import { Align, CellType, Features } from '@/constants';
@@ -47,6 +47,7 @@ export function ActionsCellRenderer({
   const exampleMenu = (
     <Menu>
       <MenuItem
+        intent={Intent.DANGER}
         onClick={onRemoveRole}
         text={<T id={'item_entries.remove_row'} />}
       />

packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormHeaderFields.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { InputGroup, FormGroup, Position, Classes } from '@blueprintjs/core';
 import { DateInput } from '@blueprintjs/datetime';
 import { FastField, ErrorMessage } from 'formik';
-import { FormattedMessage as T } from '@/components';
+import { CustomersSelect, FormattedMessage as T } from '@/components';
 import classNames from 'classnames';
 import { CLASSES } from '@/constants/classes';
 import {
@@ -121,33 +121,39 @@ export default function ExpenseFormHeader() {
         )}
       </FastField>
 
-      <FastField
+      {/* ----------- Customer ----------- */}
-        name={'customer_id'}
+      <ExpenseFormCustomerSelect />
-        customers={customers}
-        shouldUpdate={customersFieldShouldUpdate}
-      >
-        {({ form, field: { value }, meta: { error, touched } }) => (
-          <FormGroup
-            label={<T id={'customer'} />}
-            className={classNames('form-group--select-list', Classes.FILL)}
-            labelInfo={<Hint />}
-            intent={inputIntent({ error, touched })}
-            helperText={<ErrorMessage name={'assign_to_customer'} />}
-            inline={true}
-          >
-            <CustomerSelectField
-              contacts={customers}
-              selectedContactId={value}
-              defaultSelectText={<T id={'select_customer_account'} />}
-              onContactSelected={(customer) => {
-                form.setFieldValue('customer_id', customer.id);
-              }}
-              allowCreate={true}
-              popoverFill={true}
-            />
-          </FormGroup>
-        )}
-      </FastField>
     </div>
   );
 }
+
+/**
+ * Customer select field of expense form.
+ * @returns {React.ReactNode}
+ */
+function ExpenseFormCustomerSelect() {
+  const { customers } = useExpenseFormContext();
+
+  return (
+    <FormGroup
+      label={<T id={'customer'} />}
+      labelInfo={<Hint />}
+      inline={true}
+      name={'customer_id'}
+      fastField={true}
+      shouldUpdateDeps={{ items: customers }}
+      shouldUpdate={customersFieldShouldUpdate}
+    >
+      <CustomersSelect
+        name={'customer_id'}
+        items={customers}
+        placeholder={<T id={'select_customer_account'} />}
+        allowCreate={true}
+        popoverFill={true}
+        fastField={true}
+        shouldUpdateDeps={{ items: customers }}
+        shouldUpdate={customersFieldShouldUpdate}
+      />
+    </FormGroup>
+  );
+}

packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormTopBar.tsx

@@ -1,16 +1,15 @@
 // @ts-nocheck
 import React from 'react';
-import intl from 'react-intl-universal';
+import { Alignment, NavbarGroup, Classes } from '@blueprintjs/core';
-import { Button, Alignment, NavbarGroup, Classes } from '@blueprintjs/core';
 import { useSetPrimaryBranchToForm } from './utils';
 import { useFeatureCan } from '@/hooks/state';
 import { Features } from '@/constants';
 import {
-  Icon,
   BranchSelect,
   FeatureCan,
   FormTopbar,
   DetailsBarSkeletonBase,
+  FormBranchSelectButton,
 } from '@/components';
 import { useExpenseFormContext } from './ExpenseFormPageProvider';
 
@@ -51,19 +50,9 @@ function ExpenseFormSelectBranch() {
     <BranchSelect
       name={'branch_id'}
       branches={branches}
-      input={ExpenseBranchSelectButton}
+      input={FormBranchSelectButton}
       popoverProps={{ minimal: true }}
-    />
+      fill={false}
-  );
-}
-
-function ExpenseBranchSelectButton({ label }) {
-  return (
-    <Button
-      text={intl.get('expense.branch_button.label', { label })}
-      minimal={true}
-      small={true}
-      icon={<Icon icon={'branch-16'} iconSize={16} />}
     />
   );
 }

packages/webapp/src/containers/Expenses/ExpenseForm/components.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import intl from 'react-intl-universal';
-import { Button, Menu, MenuItem } from '@blueprintjs/core';
+import { Button, Intent, Menu, MenuItem } from '@blueprintjs/core';
 import { Popover2 } from '@blueprintjs/popover2';
 import { useFormikContext } from 'formik';
 
@@ -51,6 +51,7 @@ const ActionsCellRenderer = ({
   const exampleMenu = (
     <Menu>
       <MenuItem
+        intent={Intent.DANGER}
         onClick={handleClickRemoveRole}
         text={intl.get('expense.entries.remove_row')}
       />

packages/webapp/src/containers/Expenses/ExpenseForm/utils.tsx

@@ -104,7 +104,7 @@ export const transformToEditForm = (
  */
 export const customersFieldShouldUpdate = (newProps, oldProps) => {
   return (
-    newProps.customers !== oldProps.customers ||
+    newProps.shouldUpdateDeps.items !== oldProps.shouldUpdateDeps.items ||
     defaultFastFieldShouldUpdate(newProps, oldProps)
   );
 };

packages/webapp/src/containers/FinancialStatements/BalanceSheet/components.tsx

@@ -21,19 +21,21 @@ export function BalanceSheetAlerts() {
     refetchBalanceSheet();
   };
   // Can't display any error if the report is loading.
-  if (isLoading) return null;
+  if (isLoading) {
-
+    return null;
+  }
+  // Can't continue if the cost compute job is not running.
+  if (!balanceSheet.meta.is_cost_compute_running) {
+    return null;
+  }
   return (
-    <If condition={balanceSheet.meta.is_cost_compute_running}>
+    <FinancialComputeAlert>
-      <FinancialComputeAlert>
+      <Icon icon="info-block" iconSize={12} />{' '}
-        <Icon icon="info-block" iconSize={12} />{' '}
+      <T id={'just_a_moment_we_re_calculating_your_cost_transactions'} />
-        <T id={'just_a_moment_we_re_calculating_your_cost_transactions'} />
+      <Button onClick={handleRecalcReport} minimal={true} small={true}>
-
+        <T id={'report.compute_running.refresh'} />
-        <Button onClick={handleRecalcReport} minimal={true} small={true}>
+      </Button>
-          <T id={'report.compute_running.refresh'} />
+    </FinancialComputeAlert>
-        </Button>
-      </FinancialComputeAlert>
-    </If>
   );
 }
 

packages/webapp/src/containers/FinancialStatements/CashFlowStatement/components.tsx

@@ -7,6 +7,7 @@ import FinancialLoadingBar from '../FinancialLoadingBar';
 
 import { dynamicColumns } from './dynamicColumns';
 import { useCashFlowStatementContext } from './CashFlowStatementProvider';
+import { FinancialComputeAlert } from '../FinancialReportPage';
 
 /**
  * Retrieve cash flow statement columns.
@@ -27,6 +28,7 @@ export const useCashFlowStatementColumns = () => {
  */
 export function CashFlowStatementLoadingBar() {
   const { isCashFlowFetching } = useCashFlowStatementContext();
+
   return (
     <If condition={isCashFlowFetching}>
       <FinancialLoadingBar />
@@ -45,20 +47,21 @@ export function CashFlowStatementAlerts() {
   const handleRecalcReport = () => {
     refetchCashFlow();
   };
-
   // Can't display any error if the report is loading
   if (isCashFlowLoading) {
     return null;
   }
+  // Can't continue if the cost compute is not running.
+  if (!cashFlowStatement.meta.is_cost_compute_running) {
+    return null;
+  }
   return (
-    <If condition={cashFlowStatement.meta.is_cost_compute_running}>
+    <FinancialComputeAlert>
-      <div className="alert-compute-running">
+      <Icon icon="info-block" iconSize={12} />
-        <Icon icon="info-block" iconSize={12} />
+      <T id={'just_a_moment_we_re_calculating_your_cost_transactions'} />
-        <T id={'just_a_moment_we_re_calculating_your_cost_transactions'} />
+      <Button onClick={handleRecalcReport} minimal={true} small={true}>
-        <Button onClick={handleRecalcReport} minimal={true} small={true}>
+        <T id={'refresh'} />
-          <T id={'refresh'} />
+      </Button>
-        </Button>
+    </FinancialComputeAlert>
-      </div>
-    </If>
   );
 }

packages/webapp/src/containers/FinancialStatements/GeneralLedger/components.tsx

@@ -8,6 +8,7 @@ import { getColumnWidth } from '@/utils';
 import { useGeneralLedgerContext } from './GeneralLedgerProvider';
 import FinancialLoadingBar from '../FinancialLoadingBar';
 
+import { FinancialComputeAlert } from '../FinancialReportPage';
 import { Align } from '@/constants';
 
 /**
@@ -116,17 +117,18 @@ export function GeneralLedgerSheetAlerts() {
   if (isLoading) {
     return null;
   }
-
+  // Can't continue if the cost compute job is not running.
+  if (!generalLedger.meta.is_cost_compute_running) {
+    return null;
+  }
   return (
-    <If condition={generalLedger.meta.is_cost_compute_running}>
+    <FinancialComputeAlert>
-      <div class="alert-compute-running">
+      <Icon icon="info-block" iconSize={12} />
-        <Icon icon="info-block" iconSize={12} />
+      <T id={'just_a_moment_we_re_calculating_your_cost_transactions'} />
-        <T id={'just_a_moment_we_re_calculating_your_cost_transactions'} />
+      <Button onClick={handleRecalcReport} minimal={true} small={true}>
-        <Button onClick={handleRecalcReport} minimal={true} small={true}>
+        <T id={'refresh'} />
-          <T id={'refresh'} />
+      </Button>
-        </Button>
+    </FinancialComputeAlert>
-      </div>
-    </If>
   );
 }