Merge branch 'develop' into one-click-demo-account

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

@@ -62,6 +62,7 @@ export function BankAccount({
   balance,
   loading = false,
   updatedBeforeText,
+  uncategorizedTransactionsCount,
   ...restProps
 }) {
   return (
@@ -77,17 +78,19 @@ export function BankAccount({
       </BankAccountHeader>
 
       <BankAccountMeta>
-        {false && (
+        {uncategorizedTransactionsCount > 0 && (
           <BankAccountMetaLine
             title={intl.get('cash_flow.transactions_for_review')}
-            value={'0'}
+            value={uncategorizedTransactionsCount}
+            className={clsx({ [Classes.SKELETON]: loading })}
+          />
+        )}
+        {updatedBeforeText && (
+          <BankAccountMetaLine
+            title={updatedBeforeText}
             className={clsx({ [Classes.SKELETON]: loading })}
           />
         )}
-        <BankAccountMetaLine
-          title={updatedBeforeText}
-          className={clsx({ [Classes.SKELETON]: loading })}
-        />
       </BankAccountMeta>
 
       <BankAccountBalance amount={balance} loading={loading} />

packages/webapp/src/constants/subscriptionModels.tsx

@@ -44,9 +44,9 @@ export const SubscriptionPlans = [
       },
       { text: 'Unlimited User Seats' },
     ],
-    monthlyPrice: '$10',
+    monthlyPrice: '$20',
     monthlyPriceLabel: 'Per month',
-    annuallyPrice: '$7.5',
+    annuallyPrice: '$15',
     annuallyPriceLabel: 'Per month',
     monthlyVariantId: '446152',
     // monthlyVariantId: '450016',
@@ -78,9 +78,9 @@ export const SubscriptionPlans = [
       { text: 'Smart Financial Reports' },
       { text: 'Advanced Inventory Reports' },
     ],
-    monthlyPrice: '$20',
+    monthlyPrice: '$40',
     monthlyPriceLabel: 'Per month',
-    annuallyPrice: '$15',
+    annuallyPrice: '$30',
     annuallyPriceLabel: 'Per month',
     // monthlyVariantId: '450028',
     monthlyVariantId: '446155',
@@ -101,9 +101,9 @@ export const SubscriptionPlans = [
       },
       { text: 'Analysis Cost Center' },
     ],
-    monthlyPrice: '$25',
+    monthlyPrice: '$55',
     monthlyPriceLabel: 'Per month',
-    annuallyPrice: '$19',
+    annuallyPrice: '$40',
     annuallyPriceLabel: 'Per month',
     featured: true,
     // monthlyVariantId: '450031',
@@ -128,9 +128,9 @@ export const SubscriptionPlans = [
         hint: 'Track the organization inventory in multiple warehouses and transfer goods between them.',
       },
     ],
-    monthlyPrice: '$40',
+    monthlyPrice: '$60',
     monthlyPriceLabel: 'Per month',
-    annuallyPrice: '$30',
+    annuallyPrice: '$45',
     annuallyPriceLabel: 'Per month',
     // monthlyVariantId: '450024',
     monthlyVariantId: '446167',

packages/webapp/src/containers/CashFlow/AccountTransactions/ExcludedTransactions/_utils.tsx

@@ -37,12 +37,13 @@ export function useExcludedTransactionsColumns() {
     () => [
       {
         Header: 'Date',
-        accessor: 'formatted_date',
+        accessor: 'formatted_date', 
         width: 110,
       },
       {
         Header: 'Description',
         accessor: descriptionAccessor,
+        textOverview: true,
       },
       {
         Header: 'Payee',

packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashflowAccountsGrid.tsx

@@ -123,7 +123,12 @@ function CashflowBankAccount({
           code={account.code}
           balance={!isNull(account.amount) ? account.formatted_amount : '-'}
           type={account.account_type}
-          updatedBeforeText={getUpdatedBeforeText(account.createdAt)}
+          updatedBeforeText={
+            account.last_feeds_updated_from_now
+              ? `Updated ${account.last_feeds_updated_from_now} ago`
+              : ''
+          }
+          uncategorizedTransactionsCount={account.uncategorized_transactions}
         />
       </CashflowAccountAnchor>
     </ContextMenu2>