fix: specs for labels and inboxes

fix: specs failing
2023-04-06 20:18:51 +05:30 · 2023-04-06 20:04:17 +05:30
2654 changed files with 32965 additions and 92316 deletions
@@ -7,17 +7,17 @@ defaults: &defaults
  working_directory: ~/build
  docker:
    # specify the version you desire here
-    - image: cimg/ruby:3.2.2-browsers
+    - image: cimg/ruby:3.1.3-browsers

    # Specify service dependencies here if necessary
    # CircleCI maintains a library of pre-built images
    # documented at https://circleci.com/docs/2.0/circleci-images/
-    - image: cimg/postgres:15.3
+    - image: cimg/postgres:14.1
    - image: cimg/redis:6.2.6
  environment:
-    - RAILS_LOG_TO_STDOUT: false
-    - COVERAGE: true
-    - LOG_LEVEL: warn
+      - RAILS_LOG_TO_STDOUT: false
+      - COVERAGE: true
+      - LOG_LEVEL: warn
  parallelism: 4
  resource_class: large

@@ -46,7 +46,7 @@ jobs:
            export NVM_DIR="$HOME/.nvm"
            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
            [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-            nvm install v20
+            nvm install v16
            echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
            echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV

@@ -64,6 +64,7 @@ jobs:
            - ~/.bundle
          key: chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-v20220524-{{ checksum "Gemfile.lock" }}

+
      # Only necessary if app uses webpacker or yarn in some other way
      - restore_cache:
          keys:
@@ -72,7 +73,7 @@ jobs:

      - run:
          name: yarn
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
+          command: yarn install --cache-folder ~/.cache/yarn

      # Store yarn / webpacker cache
      - save_cache:
@@ -81,7 +82,7 @@ jobs:
            - ~/.cache/yarn

      - run:
-          name: Download cc-test-reporter
+          name:  Download cc-test-reporter
          command: |
            mkdir -p ~/tmp
            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ~/tmp/cc-test-reporter
@@ -103,8 +104,9 @@ jobs:
            fi
            curl -L https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar > ~/tmp/openapi-generator-cli-6.3.0.jar
            java -jar ~/tmp/openapi-generator-cli-6.3.0.jar validate -i swagger/swagger.json
-
+            
      # Database setup
+      - run: yarn install --check-files
      - run: bundle exec rake db:create
      - run: bundle exec rake db:schema:load

@@ -115,7 +117,7 @@ jobs:
      - run:
          name: Rubocop
          command: bundle exec rubocop
-
+      
      # - run:
      #     name: Brakeman
      #     command: bundle exec brakeman
@@ -124,21 +126,6 @@ jobs:
          name: eslint
          command: yarn run eslint

-      # Run frontend tests
-      - run:
-          name: Run frontend tests
-          command: |
-            mkdir -p ~/tmp/test-results/frontend_specs
-            ~/tmp/cc-test-reporter before-build
-            TESTFILES=$(circleci tests glob **/specs/*.spec.js | circleci tests split --split-by=timings)
-            yarn test:coverage --profile 10 \
-                               --out ~/tmp/test-results/yarn.xml \
-                               -- ${TESTFILES}
-      - run:
-          name: Code Climate Test Coverage
-          command: |
-            ~/tmp/cc-test-reporter format-coverage -t lcov -o "coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json"
-
      # Run rails tests
      - run:
          name: Run backend tests
@@ -158,6 +145,20 @@ jobs:
          command: |
            ~/tmp/cc-test-reporter format-coverage -t simplecov -o "coverage/codeclimate.$CIRCLE_NODE_INDEX.json"

+      - run:
+          name: Run frontend tests
+          command: |
+            mkdir -p ~/tmp/test-results/frontend_specs
+            ~/tmp/cc-test-reporter before-build
+            TESTFILES=$(circleci tests glob **/specs/*.spec.js | circleci tests split --split-by=timings)
+            yarn test:coverage --profile 10 \
+                               --out ~/tmp/test-results/yarn.xml \
+                               -- ${TESTFILES}
+      - run:
+          name: Code Climate Test Coverage
+          command: |
+            ~/tmp/cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.frontend_$CIRCLE_NODE_INDEX.json buildreports/lcov.info    
+            
      - persist_to_workspace:
          root: coverage
          paths:
@@ -181,7 +182,7 @@ jobs:
      - attach_workspace:
          at: ~/build
      - run:
-          name: Download cc-test-reporter
+          name:  Download cc-test-reporter
          command: |
            mkdir -p ~/tmp
            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ~/tmp/cc-test-reporter
@@ -203,4 +204,4 @@ workflows:
      - build
      - upload-coverage:
          requires:
-            - build
+             - build
@@ -30,7 +30,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
    npm

 # Install rbenv and ruby
-ARG RUBY_VERSION="3.2.2"
+ARG RUBY_VERSION="3.1.3"
 RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
    &&  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \
    &&  echo 'eval "$(rbenv init -)"' >> ~/.bashrc
@@ -1,6 +1,8 @@
 .bundle
 .env
 .env.*
+.git
+.gitignore
 docker-compose.*
 docker/Dockerfile
 docker/dockerfiles
@@ -110,8 +110,6 @@ AWS_REGION=
 RAILS_LOG_TO_STDOUT=true
 LOG_LEVEL=info
 LOG_SIZE=500
-# Configure this environment variable if you want to use lograge instead of rails logger
-#LOGRAGE_ENABLED=true

 ### This environment variables are only required if you are setting up social media channels

@@ -161,6 +159,9 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 # for mobile apps
 # FCM_SERVER_KEY=

+## Bot Customizations
+USE_INBOX_AVATAR_FOR_BOT=true
+
 ### APM and Error Monitoring configurations
 ## Elastic APM
 ## https://www.elastic.co/guide/en/apm/agent/ruby/current/getting-started-rails.html
@@ -173,9 +174,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## LogRocket
 # LOG_ROCKET_PROJECT_ID=xxxxx/some-project

-# MICROSOFT CLARITY
-# MS_CLARITY_TOKEN=xxxxxxxxx
-
 ## Scout
 ## https://scoutapm.com/docs/ruby/configuration
 # SCOUT_KEY=YOURKEY
@@ -199,8 +197,6 @@ ANDROID_SHA256_CERT_FINGERPRINT=AC:73:8E:DE:EB:56:EA:CC:10:87:02:A7:65:37:7B:38:
 ## Rack Attack configuration
 ## To prevent and throttle abusive requests
 # ENABLE_RACK_ATTACK=true
-# RACK_ATTACK_IP_LIMIT=3000
-# ENABLE_RACK_ATTACK_WIDGET_API=true

 ## Running chatwoot as an API only server
 ## setting this value to true will disable the frontend dashboard endpoints
@@ -232,11 +228,3 @@ AZURE_APP_SECRET=
 ## Change these values to fine tune performance
 # control the concurrency setting of sidekiq
 # SIDEKIQ_CONCURRENCY=10
-
-
-# AI powered features
-## OpenAI key
-# OPENAI_API_KEY=
-
-# Sentiment analysis model file path
-SENTIMENT_FILE_PATH=
@@ -0,0 +1,78 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'Bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See the error
+
+**Expected behavior**
+
+Share a clear and concise description of what you expected to happen.
+
+**Screenshots**
+
+If applicable, add screenshots to help explain your problem.
+
+**Browser logs**
+
+Share the browser logs to debug the issue further.
+
+**Server logs**
+
+Share the server logs to debug the issue further.
+
+**Environment**
+
+Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self-hosted installation of Chatwoot. If you are using a self-hosted installation of Chatwoot, describe the type of deployment (Docker/Linux VM installation/Heroku/Kubernetes/Other).
+
+- [ ] app.chatwoot.com (Chatwoot Cloud)
+- [ ] Self-hosted
+- - [ ] Linux VM
+- - [ ] Docker
+- - [ ] Kubernetes
+- - [ ] Heroku
+- - [ ] Other (Please specify)
+
+
+**Desktop (please complete the following information)** (If applicable)
+ - OS: [e.g. Linux, Windows, MacOS]
+ - Browser [e.g. chrome, firefox, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information)** (If applicable)
+ - Device: [e.g. iPhone6, Pixel7]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, firefox, safari]
+ - Version [e.g. 22]
+
+**Docker** (If applicable)
+
+Please share the output of the following.
+- `docker version`
+- `docker info`
+- `docker-compose version`
+
+**Cloud Provider** (If applicable)
+- [ ] AWS
+- [ ] GCP
+- [ ] Azure
+- [ ] DigitalOcean
+- [ ] Others
+
+**Additional context**
+
+Add any other context about the problem here.
@@ -1,78 +0,0 @@
-name: 🐞 Bug report
-description: Create a report to help us improve
-labels: 'Bug'
-body:
-  - type: textarea
-    attributes:
-      label: Describe the bug
-      description: A concise description of what you expected to happen along with screenshots if applicable.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1. In this environment...
-        2. With this config...
-        3. Run '...'
-        4. See error...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: A concise description of what you expected to happen.
-  - type: dropdown
-    id: environment
-    attributes:
-      label: Environment
-      description: Describe whether you are using Chatwoot Cloud (app.chatwoot.com) or a self-hosted installation of Chatwoot. If you are using a self-hosted installation of Chatwoot, describe the type of deployment (Docker/Linux VM installation/Heroku/Kubernetes/Other).
-      options:
-        - app.chatwoot.com
-        - Linux VM
-        - Docker
-        - Kubernetes
-        - Heroku
-        - Other [please specify in the description]
-    validations:
-      required: true
-  - type: dropdown
-    id: provider
-    attributes:
-      label: Cloud Provider
-      description:
-      options:
-        - AWS
-        - GCP
-        - Azure
-        - DigitalOcean
-        - Other [please specify in the description]
-  - type: dropdown
-    id: platform
-    attributes:
-      label: Platform
-      description: Describe the platform you are using
-      options:
-        - Browser
-        - Mobile
-  - type: input
-    attributes:
-      label: Operating system
-      description: The operating system and the version you are using.
-  - type: input
-    attributes:
-      label: Browser and version
-      description: The name of the browser and version you are using.
-  - type: textarea
-    attributes:
-      label: Docker (if applicable)
-      description: |
-        Please share the output of the following. 
-        - `docker version`
-        - `docker info`
-        - `docker-compose version`
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context about the problem here.
@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Report a security issue
-    url: https://www.chatwoot.com/docs/contributing-guide/security-reports/
-    about: Guidelines and steps to report a security vulnerability. Please report security vulnerabilities here.
-  - name: Product Documentation
-    url: https://www.chatwoot.com/help-center
-    about: If you have questions, are confused, or just want to understand our product better, please check out our documentation.
@@ -0,0 +1,20 @@
+---
+name: Enhancement request
+about: Suggest any enhancements for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your enhancement request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions you've considered.
+
+**Additional context**
+Add any other context or screenshots about the enhancement request here.
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -1,28 +0,0 @@
-name: 🧙 Feature request
-description: Suggest an idea for this project
-labels: 'feature-request'
-body:
-  - type: textarea
-    attributes:
-      label: Is your feature or enhancement related to a problem? Please describe.
-      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.
-    validations:
-      required: false
@@ -1,23 +0,0 @@
-# ref: https://github.com/amannn/action-semantic-pull-request
-# ensure PR title is in semantic format
-
-name: "Lint PR"
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-
-permissions:
-  pull-requests: read
-
-jobs:
-  main:
-    name: Validate PR title
-    runs-on: ubuntu-latest
-    steps:
-      - uses: amannn/action-semantic-pull-request@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -1,55 +0,0 @@
-name: Log Lines Percentage Check
-
-on:
-  pull_request:
-    branches:
-      - develop
-
-jobs:
-  log_lines_check:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Check for log lines and calculate percentage
-        run: |
-          # Define the log line pattern
-          LOG_LINE_PATTERN="Rails\.logger"
-
-          # Get the list of changed files in the pull request
-          CHANGED_FILES=$(git diff --name-only)
-
-          # Initialize a flag to track if any files have insufficient log lines
-          INSUFFICIENT_LOGS=0
-
-          for file in $CHANGED_FILES; do
-            if [[ $file =~ \.rb$ && ! $file =~ _spec\.rb$ ]]; then
-              # Count the total number of lines in the file
-              total_lines=$(wc -l < "$file")
-
-              # Count the number of log lines in the file
-              log_lines=$(grep -c "$LOG_LINE_PATTERN" "$file")
-
-              # Calculate the percentage of log lines
-              if [ "$total_lines" -gt 0 ]; then
-                percentage=$(awk "BEGIN { pc=100*${log_lines}/${total_lines}; i=int(pc); print (pc-i<0.5)?i:i+1 }")
-              else
-                percentage=0
-              fi
-
-              # Check if the percentage is less than 5%
-              if [ "$percentage" -lt 5 ]; then
-                echo "Error: Log lines percentage is less than 5% ($percentage%) in $file. Please add more log lines using Rails.logger statements."
-                INSUFFICIENT_LOGS=1
-              else
-                echo "Log lines percentage is $percentage% in $file. Code looks good!"
-              fi
-            fi
-          done
-
-          # If any files have insufficient log lines, fail the action
-          if [ "$INSUFFICIENT_LOGS" -eq 1 ]; then
-            exit 1
-          fi
@@ -18,12 +18,11 @@ jobs:
    runs-on: ubuntu-20.04
    services:
      postgres:
-        image: postgres:15.3
+        image: postgres:10.8
        env:
          POSTGRES_USER: postgres
          POSTGRES_PASSWORD: ""
          POSTGRES_DB: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
        ports:
          - 5432:5432
        # needed because the postgres container does not provide a healthcheck
@@ -52,8 +51,7 @@ jobs:

    - uses: actions/setup-node@v3
      with:
-        node-version: 20
-        cache: yarn
+        node-version: 16

    - name: yarn
      run: yarn install
@@ -76,8 +74,6 @@ jobs:
    - name: Run backend tests
      run: |
        bundle exec rspec --profile=10 --format documentation
-      env: 
-        NODE_OPTIONS: --openssl-legacy-provider

    - name: Upload rails log folder
      uses: actions/upload-artifact@v3
@@ -1,79 +0,0 @@
-# #
-# # This workflow will run specs related to response bot
-# # This can only be activated in installations Where vector extension is available.
-# #
-
-name: Run Response Bot spec
-on:
-  push:
-    branches:
-      - develop
-      - master
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04
-    services:
-      postgres:
-        image: ankane/pgvector
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: ""
-          POSTGRES_DB: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
-        ports:
-          - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
-        # tmpfs makes DB faster by using RAM
-        options: >-
-          --mount type=tmpfs,destination=/var/lib/postgresql/data
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        options: --entrypoint redis-server
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        ref: ${{ github.event.pull_request.head.ref }}
-        repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-    - uses: ruby/setup-ruby@v1
-      with:
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 20
-        cache: yarn
-
-    - name: yarn
-      run: yarn install
-
-    - name: Create database
-      run: bundle exec rake db:create
-
-    - name: Seed database
-      run: bundle exec rake db:schema:load
-
-    - name: Enable ResponseBotService in installation
-      run: RAILS_ENV=test bundle exec rails runner "Features::ResponseBotService.new.enable_in_installation"
-
-    # Run  Response Bot specs
-    - name: Run backend tests
-      run: |
-        bundle exec rspec spec/enterprise/controllers/api/v1/accounts/response_sources_controller_spec.rb spec/enterprise/controllers/enterprise/api/v1/accounts/inboxes_controller_spec.rb:47 --profile=10 --format documentation
-
-    - name: Upload rails log folder
-      uses: actions/upload-artifact@v3
-      if: always()
-      with:
-        name: rails-log-folder
-        path: log
@@ -1,41 +0,0 @@
-name: Run Size Limit Check
-
-on:
-  pull_request:
-    branches:
-      - develop
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          cache: 'yarn'
-
-      - name: yarn
-        run: yarn install
-
-      - name: Strip enterprise code
-        run: |
-          rm -rf enterprise
-          rm -rf spec/enterprise
-          
-      - name: Run asset compile
-        run: bundle exec rake assets:precompile
-        env:
-          NODE_OPTIONS: --openssl-legacy-provider
-
-      - name: Size Check
-        run: yarn run size
@@ -61,18 +61,8 @@ test/cypress/videos/*
 /config/master.key
 /config/*.enc

-#ignore files under .vscode directory
-.vscode
+.vscode/settings.json

 # yalc for local testing
 .yalc
-yalc.lock
-
-/public/packs
-/public/packs-test
-/node_modules
-/yarn-error.log
-yarn-debug.log*
-.yarn-integrity
-
-/storybook-static
+yalc.lock
@@ -1 +1 @@
-20.5.1
+14.17.4
@@ -8,11 +8,15 @@ Layout/LineLength:
  Max: 150

 Metrics/ClassLength:
-  Max: 175
+  Max: 125
  Exclude:
-    - 'app/models/message.rb'
    - 'app/models/conversation.rb'
-
+    - 'app/models/contact.rb'
+    - 'app/mailers/conversation_reply_mailer.rb'
+    - 'app/models/message.rb'
+    - 'app/builders/messages/facebook/message_builder.rb'
+    - 'app/controllers/api/v1/accounts/contacts_controller.rb'
+    - 'app/listeners/action_cable_listener.rb'
 RSpec/ExampleLength:
  Max: 25
 Style/Documentation:
@@ -67,10 +71,6 @@ Rails/ApplicationController:
    - 'app/controllers/platform_controller.rb'
    - 'app/controllers/public_controller.rb'
    - 'app/controllers/survey/responses_controller.rb'
-Rails/FindEach:
-  Enabled: true
-  Include:
-    - 'app/**/*.rb'
 Rails/CompactBlank:
  Enabled: false
 Rails/EnvironmentVariableAccess:
@@ -83,7 +83,6 @@ Style/ClassAndModuleChildren:
  EnforcedStyle: compact
  Exclude:
    - 'config/application.rb'
-    - 'config/initializers/monkey_patches/*'
 Style/MapToHash:
  Enabled: false
 Style/HashSyntax:
@@ -159,32 +158,8 @@ Rails/RenderInline:
 Performance/CollectionLiteralInLoop:
  Exclude:
    - 'db/migrate/20210315101919_enable_email_channel.rb'
-Rails/ThreeStateBooleanColumn:
-  Exclude:
-    - 'db/migrate/20200509044639_add_hide_input_flag_to_bot_config.rb'
-    - 'db/migrate/20200605130625_agent_away_message_to_auto_reply.rb'
-    - 'db/migrate/20200606132552_create_labels.rb'
-    - 'db/migrate/20201027135006_create_working_hours.rb'
-    - 'db/migrate/20210112174124_add_hmac_token_to_inbox.rb'
-    - 'db/migrate/20210114202310_create_teams.rb'
-    - 'db/migrate/20210212154240_add_request_for_email_on_channel_web_widget.rb'
-    - 'db/migrate/20210428135041_add_campaigns.rb'
-    - 'db/migrate/20210602182058_add_hmac_to_api_channel.rb'
-    - 'db/migrate/20210609133433_add_email_collect_to_inboxes.rb'
-    - 'db/migrate/20210618095823_add_csat_toggle_for_inbox.rb'
-    - 'db/migrate/20210927062350_add_trigger_only_during_business_hours_collect_to_campaigns.rb'
-    - 'db/migrate/20211027073553_add_imap_smtp_config_to_channel_email.rb'
-    - 'db/migrate/20211109143122_add_tweet_enabled_flag_to_twitter_channel.rb'
-    - 'db/migrate/20211216110209_add_allow_messages_after_resolved_to_inbox.rb'
-    - 'db/migrate/20220116103902_add_open_ssl_verify_mode_to_channel_email.rb'
-    - 'db/migrate/20220216151613_add_open_all_day_to_working_hour.rb'
-    - 'db/migrate/20220511072655_add_archive_column_to_portal.rb'
-    - 'db/migrate/20230503101201_create_sla_policies.rb'
-RSpec/IndexedLet:
-  Enabled: false
 RSpec/NamedSubject:
  Enabled: false
-
 # we should bring this down
 RSpec/MultipleMemoizedHelpers:
  Max: 14
@@ -1 +1 @@
-3.2.2
+3.1.3
@@ -1 +0,0 @@
-/spec
@@ -23,18 +23,6 @@ module.exports = {
    },
    '@storybook/addon-links',
    '@storybook/addon-essentials',
-    {
-      /**
-       * Fix Storybook issue with PostCSS@8
-       * @see https://github.com/storybookjs/storybook/issues/12668#issuecomment-773958085
-       */
-      name: '@storybook/addon-postcss',
-      options: {
-        postcssLoaderOptions: {
-          implementation: require('postcss'),
-        },
-      },
-    },
  ],
  webpackFinal: config => {
    const newConfig = {
@@ -47,7 +35,7 @@ module.exports = {

    newConfig.module.rules.push({
      test: /\.scss$/,
-      use: ['style-loader', 'css-loader', 'postcss-loader', 'sass-loader'],
+      use: ['style-loader', 'css-loader', 'sass-loader'],
      include: path.resolve(__dirname, '../app/javascript'),
    });

@@ -4,12 +4,10 @@ import Vuex from 'vuex';
 import VueI18n from 'vue-i18n';
 import Vuelidate from 'vuelidate';
 import Multiselect from 'vue-multiselect';
-import VueDOMPurifyHTML from 'vue-dompurify-html';
 import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';

 import WootUiKit from '../app/javascript/dashboard/components';
 import i18n from '../app/javascript/dashboard/i18n';
-import { domPurifyConfig } from 'shared/helpers/HTMLSanitizer';

 import '../app/javascript/dashboard/assets/scss/storybook.scss';

@@ -17,8 +15,6 @@ Vue.use(VueI18n);
 Vue.use(Vuelidate);
 Vue.use(WootUiKit);
 Vue.use(Vuex);
-Vue.use(VueDOMPurifyHTML, domPurifyConfig);
-
 Vue.component('multiselect', Multiselect);
 Vue.component('fluent-icon', FluentIcon);

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'

-ruby '3.2.2'
+ruby '3.1.3'

 ##-- base gems for rails --##
 gem 'rack-cors', require: 'rack/cors'
-gem 'rails', '~> 7.0.8.0'
+gem 'rails', '~> 6.1', '>= 6.1.7.3'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false

@@ -34,21 +34,21 @@ gem 'commonmarker'
 # Validate Data against JSON Schema
 gem 'json_schemer'
 # Rack middleware for blocking & throttling abusive requests
-gem 'rack-attack', '>= 6.7.0'
+gem 'rack-attack'
 # a utility tool for streaming, flexible and safe downloading of remote files
-gem 'down'
+gem 'down', '~> 5.0'
 # authentication type to fetch and send mail over oauth2.0
 gem 'gmail_xoauth'
 # Prevent CSV injection
 gem 'csv-safe'
+# Support message translation
+gem 'google-cloud-translate'

 ##-- for active storage --##
 gem 'aws-sdk-s3', require: false
-# original gem isn't maintained actively
-# we wanted updated version of faraday which is a dependency for slack-ruby-client
-gem 'azure-storage-blob', git: 'https://github.com/chatwoot/azure-storage-ruby', branch: 'chatwoot', require: false
+gem 'azure-storage-blob', require: false
 gem 'google-cloud-storage', require: false
-gem 'image_processing'
+gem 'image_processing', '~> 1.12.2'

 ##-- gems for database --#
 gem 'groupdate'
@@ -62,43 +62,38 @@ gem 'activerecord-import'
 gem 'dotenv-rails'
 gem 'foreman'
 gem 'puma'
-gem 'webpacker'
+gem 'webpacker', '~> 5.4', '>= 5.4.3'
 # metrics on heroku
 gem 'barnes'

 ##--- gems for authentication & authorization ---##
 gem 'devise'
-gem 'devise-secure_password', git: 'https://github.com/chatwoot/devise-secure_password', branch: 'chatwoot'
+gem 'devise-secure_password', '~> 2.0', git: 'https://github.com/chatwoot/devise-secure_password'
 gem 'devise_token_auth'
 # authorization
 gem 'jwt'
 gem 'pundit'
 # super admin
-gem 'administrate', '>= 0.19.0'
-gem 'administrate-field-active_storage'
+gem 'administrate'

 ##--- gems for pubsub service ---##
 # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/
 gem 'wisper', '2.0.0'

 ##--- gems for channels ---##
+# TODO: bump up gem to 2.0
 gem 'facebook-messenger'
 gem 'line-bot-api'
 gem 'twilio-ruby', '~> 5.66'
 # twitty will handle subscription of twitter account events
 # gem 'twitty', git: 'https://github.com/chatwoot/twitty'
-gem 'twitty', '~> 0.1.5'
+gem 'twitty'
 # facebook client
 gem 'koala'
 # slack client
-gem 'slack-ruby-client', '~> 2.0.0'
+gem 'slack-ruby-client'
 # for dialogflow integrations
-gem 'google-cloud-dialogflow-v2'
-gem 'grpc'
-# Translate integrations
-# 'google-cloud-translate' gem depends on faraday 2.0 version
-# this dependency breaks the slack-ruby-client gem
-gem 'google-cloud-translate-v3'
+gem 'google-cloud-dialogflow'

 ##-- apm and error monitoring ---#
 # loaded only when environment variables are set.
@@ -108,14 +103,14 @@ gem 'elastic-apm', require: false
 gem 'newrelic_rpm', require: false
 gem 'newrelic-sidekiq-metrics', require: false
 gem 'scout_apm', require: false
-gem 'sentry-rails', '>= 5.11.0', require: false
+gem 'sentry-rails', require: false
 gem 'sentry-ruby', require: false
-gem 'sentry-sidekiq', '>= 5.11.0', require: false
+gem 'sentry-sidekiq', require: false

 ##-- background job processing --##
-gem 'sidekiq', '>= 7.1.3'
+gem 'sidekiq', '~> 6.4.2'
 # We want cron jobs
-gem 'sidekiq-cron', '>= 1.10.1'
+gem 'sidekiq-cron', '~> 1.6', '>= 1.6.0'

 ##-- Push notification service --##
 gem 'fcm'
@@ -134,10 +129,7 @@ gem 'procore-sift'

 # parse email
 gem 'email_reply_trimmer'
-
-# TODO: we might have to fork this gem since 0.3.1 has hard depency on nokogir 1.10.
-# and this gem hasn't been updated for a while.
-gem 'html2text', git: 'https://github.com/chatwoot/html2text_ruby', branch: 'chatwoot'
+gem 'html2text'

 # to calculate working hours
 gem 'working_hours'
@@ -152,33 +144,12 @@ gem 'stripe'
 ## to populate db with sample data
 gem 'faker'

-# Include logrange conditionally in intializer using env variable
-gem 'lograge', '~> 0.13.0', require: false
+# Can remove this in rails 7
+gem 'net-imap', require: false
+gem 'net-pop', require: false
+gem 'net-smtp', require: false

-# worked with microsoft refresh token
-gem 'omniauth-oauth2'
-
-gem 'audited', '~> 5.3'
-
-# need for google auth
-gem 'omniauth'
-gem 'omniauth-google-oauth2'
-gem 'omniauth-rails_csrf_protection', '~> 1.0'
-
-## Gems for reponse bot
-# adds cosine similarity to postgres using vector extension
-gem 'neighbor'
-gem 'pgvector'
-# Convert Website HTML to Markdown
-gem 'reverse_markdown'
-
-# Sentiment analysis
-gem 'informers'
-
-### Gems required only in specific deployment environments ###
-##############################################################
-
-group :production do
+group :production, :staging do
  # we dont want request timing out in development while using byebug
  gem 'rack-timeout'
 end
@@ -187,8 +158,7 @@ group :development do
  gem 'annotate'
  gem 'bullet'
  gem 'letter_opener'
-  gem 'scss_lint', require: false
-  gem 'web-console', '>= 4.2.1'
+  gem 'web-console'

  # used in swagger build
  gem 'json_refs'
@@ -197,13 +167,13 @@ group :development do
  gem 'squasher'

  # profiling
-  gem 'rack-mini-profiler', '>= 3.1.1', require: false
+  gem 'rack-mini-profiler', require: false
  gem 'stackprof'
 end

 group :test do
  # Cypress in rails.
-  gem 'cypress-on-rails'
+  gem 'cypress-on-rails', '~> 1.13', '>= 1.13.1'
  # fast cleaning of database
  gem 'database_cleaner'
  # mock http calls
@@ -220,13 +190,12 @@ group :development, :test do
  gem 'bundle-audit', require: false
  gem 'byebug', platform: :mri
  gem 'climate_control'
-  gem 'debug', '~> 1.8'
  gem 'factory_bot_rails'
  gem 'listen'
  gem 'mock_redis'
  gem 'pry-rails'
  gem 'rspec_junit_formatter'
-  gem 'rspec-rails'
+  gem 'rspec-rails', '~> 5.0.3'
  gem 'rubocop', require: false
  gem 'rubocop-performance', require: false
  gem 'rubocop-rails', require: false
@@ -237,3 +206,13 @@ group :development, :test do
  gem 'spring'
  gem 'spring-watcher-listen'
 end
+
+# worked with microsoft refresh token
+gem 'omniauth-oauth2'
+
+gem 'audited', '~> 5.2'
+
+# need for google auth
+gem 'omniauth'
+gem 'omniauth-google-oauth2'
+gem 'omniauth-rails_csrf_protection', '~> 1.0'
@@ -1,52 +0,0 @@
-# Variables
-APP_NAME := chatwoot
-RAILS_ENV ?= development
-
-# Targets
-setup:
-	gem install bundler
-	bundle install
-	yarn install
-
-db_create:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:create
-
-db_migrate:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:migrate
-
-db_seed:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:seed
-
-db:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails db:chatwoot_prepare
-
-console:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails console
-
-server:
-	RAILS_ENV=$(RAILS_ENV) bundle exec rails server -b 0.0.0.0 -p 3000
-
-burn:
-	bundle && yarn
-
-run:
-	@if [ -f ./.overmind.sock ]; then \
-		echo "Overmind is already running. Use 'make force_run' to start a new instance."; \
-	else \
-		overmind start -f Procfile.dev; \
-	fi
-
-force_run:
-	rm -f ./.overmind.sock
-	overmind start -f Procfile.dev
-
-debug:
-	overmind connect backend
-
-debug_worker:
-	overmind connect worker
-
-docker: 
-	docker build -t $(APP_NAME) -f ./docker/Dockerfile .
-
-.PHONY: setup db_create db_migrate db_seed db console server burn docker run force_run debug debug_worker
@@ -1,3 +1,3 @@
-release: POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare && echo $SOURCE_VERSION > .git_sha
+release: POSTGRES_STATEMENT_TIMEOUT=600s bundle exec rails db:chatwoot_prepare
 web: bundle exec rails ip_lookup:setup && bin/rails server -p $PORT -e $RAILS_ENV
 worker: bundle exec rails ip_lookup:setup && bundle exec sidekiq -C config/sidekiq.yml
@@ -1,4 +1,4 @@
 backend: bin/rails s -p 3000
-frontend: export NODE_OPTIONS=--openssl-legacy-provider && bin/webpack-dev-server
+frontend: bin/webpack-dev-server
 # https://github.com/mperham/sidekiq/issues/3090#issuecomment-389748695
 worker: dotenv bundle exec sidekiq -C config/sidekiq.yml
@@ -1 +1 @@
-2.17.0
+2.2.0
@@ -1 +1 @@
-2.3.0
+2.1.0
@@ -60,9 +60,6 @@
  ],
  "stack": "heroku-20",
  "buildpacks": [
-    {
-      "url": "heroku/nodejs"
-    },
    {
      "url": "heroku/ruby"
    }
@@ -1,6 +1,5 @@
 //= link_tree ../images
 //= link administrate/application.css
 //= link administrate/application.js
-//= link administrate-field-active_storage/application.css
 //= link dashboardChart.js
 //= link secretField.js
@@ -11,7 +11,7 @@ function prepareData(data) {

 function getChartOptions() {
  var fontFamily =
-    'PlusJakarta,-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
+    'Inter,-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
  return {
    responsive: true,
    legend: { labels: { fontFamily } },
@@ -1,10 +1,10 @@
 // Typography
-$base-font-family: PlusJakarta, Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+$base-font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
  "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
  sans-serif !default;
 $heading-font-family: $base-font-family !default;

-$base-font-size: 16px !default;
+$base-font-size: 10px !default;

 $base-line-height: 1.5 !default;
 $heading-line-height: 1.2 !default;
@@ -63,43 +63,28 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
  end

  def conversation
-    @conversation ||= Conversation.where(conversation_params).find_by(
-      "additional_attributes ->> 'type' = 'instagram_direct_message'"
-    ) || build_conversation
+    @conversation ||= Conversation.find_by(conversation_params) || build_conversation
  end

  def message_content
    @messaging[:message][:text]
  end

-  def story_reply_attributes
-    message[:reply_to][:story] if message[:reply_to].present? && message[:reply_to][:story].present?
-  end
-
  def build_message
    return if @outgoing_echo && already_sent_from_chatwoot?
    return if message_content.blank? && all_unsupported_files?

    @message = conversation.messages.create!(message_params)
-    save_story_id

    attachments.each do |attachment|
      process_attachment(attachment)
    end
  end

-  def save_story_id
-    return if story_reply_attributes.blank?
-
-    @message.save_story_info(story_reply_attributes)
-  end
-
  def build_conversation
    @contact_inbox ||= contact.contact_inboxes.find_by!(source_id: message_source_id)
-
    Conversation.create!(conversation_params.merge(
-                           contact_inbox_id: @contact_inbox.id,
-                           additional_attributes: { type: 'instagram_direct_message' }
+                           contact_inbox_id: @contact_inbox.id
                         ))
  end

@@ -107,7 +92,10 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
    {
      account_id: @inbox.account_id,
      inbox_id: @inbox.id,
-      contact_id: contact.id
+      contact_id: contact.id,
+      additional_attributes: {
+        type: 'instagram_direct_message'
+      }
    }
  end

@@ -48,22 +48,17 @@ class Messages::MessageBuilder
  def process_emails
    return unless @conversation.inbox&.inbox_type == 'Email'

-    cc_emails = process_email_string(@params[:cc_emails])
-    bcc_emails = process_email_string(@params[:bcc_emails])
-    to_emails = process_email_string(@params[:to_emails])
+    cc_emails = []
+    cc_emails = @params[:cc_emails].split(',') if @params[:cc_emails].present?

-    all_email_addresses = cc_emails + bcc_emails + to_emails
+    bcc_emails = []
+    bcc_emails = @params[:bcc_emails].split(',') if @params[:bcc_emails].present?
+
+    all_email_addresses = cc_emails + bcc_emails
    validate_email_addresses(all_email_addresses)

    @message.content_attributes[:cc_emails] = cc_emails
    @message.content_attributes[:bcc_emails] = bcc_emails
-    @message.content_attributes[:to_emails] = to_emails
-  end
-
-  def process_email_string(email_string)
-    return [] if email_string.blank?
-
-    email_string.gsub(/\s+/, '').split(',')
  end

  def validate_email_addresses(all_emails)
@@ -20,7 +20,7 @@ class V2::ReportBuilder

  # For backward compatible with old report
  def build
-    if %w[avg_first_response_time avg_resolution_time reply_time].include?(params[:metric])
+    if %w[avg_first_response_time avg_resolution_time].include?(params[:metric])
      timeseries.each_with_object([]) do |p, arr|
        arr << { value: p[1], timestamp: p[0].in_time_zone(@timezone).to_i, count: @grouped_values.count[p[0]] }
      end
@@ -33,19 +33,18 @@ class V2::ReportBuilder

  def summary
    {
-      conversations_count: conversations.count,
-      incoming_messages_count: incoming_messages.count,
-      outgoing_messages_count: outgoing_messages.count,
+      conversations_count: conversations_count.values.sum,
+      incoming_messages_count: incoming_messages_count.values.sum,
+      outgoing_messages_count: outgoing_messages_count.values.sum,
      avg_first_response_time: avg_first_response_time_summary,
      avg_resolution_time: avg_resolution_time_summary,
-      resolutions_count: resolutions.count,
-      reply_time: reply_time_summary
+      resolutions_count: resolutions_count.values.sum
    }
  end

  def conversation_metrics
    if params[:type].equal?(:account)
-      live_conversations
+      conversations
    else
      agent_metrics.sort_by { |hash| hash[:metric][:open] }.reverse
    end
@@ -90,16 +89,17 @@ class V2::ReportBuilder
        email: @user.email,
        thumbnail: @user.avatar_url,
        availability: account_user.availability_status,
-        metric: live_conversations
+        metric: conversations
      }
    end
  end

-  def live_conversations
+  def conversations
    @open_conversations = scope.conversations.where(account_id: @account.id).open
+    first_response_count = @account.reporting_events.where(name: 'first_response', conversation_id: @open_conversations.pluck('id')).count
    metric = {
      open: @open_conversations.count,
-      unattended: @open_conversations.unattended.count
+      unattended: @open_conversations.count - first_response_count
    }
    metric[:unassigned] = @open_conversations.unassigned.count if params[:type].equal?(:account)
    metric
@@ -1,24 +1,16 @@
 class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
  before_action :portal
  before_action :check_authorization
-  before_action :fetch_article, except: [:index, :create, :reorder]
+  before_action :fetch_article, except: [:index, :create, :attach_file]
  before_action :set_current_page, only: [:index]

  def index
    @portal_articles = @portal.articles
    @all_articles = @portal_articles.search(list_params)
    @articles_count = @all_articles.count
-
-    @articles = if list_params[:category_slug].present?
-                  @all_articles.order_by_position.page(@current_page).per(50)
-                else
-                  @all_articles.order_by_updated_at.page(@current_page)
-                end
+    @articles = @all_articles.order_by_updated_at.page(@current_page)
  end

-  def show; end
-  def edit; end
-
  def create
    @article = @portal.articles.create!(article_params)
    @article.associate_root_article(article_params[:associated_article_id])
@@ -26,6 +18,10 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
    render json: { error: @article.errors.messages }, status: :unprocessable_entity and return unless @article.valid?
  end

+  def edit; end
+
+  def show; end
+
  def update
    @article.update!(article_params) if params[:article].present?
    render json: { error: @article.errors.messages }, status: :unprocessable_entity and return unless @article.valid?
@@ -36,9 +32,15 @@ class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
    head :ok
  end

-  def reorder
-    Article.update_positions(params[:positions_hash])
-    head :ok
+  def attach_file
+    file_blob = ActiveStorage::Blob.create_and_upload!(
+      key: nil,
+      io: params[:background_image].tempfile,
+      filename: params[:background_image].original_filename,
+      content_type: params[:background_image].content_type
+    )
+    file_blob.save!
+    render json: { file_url: url_for(file_blob) }
  end

  private
@@ -6,8 +6,6 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
    @automation_rules = Current.account.automation_rules
  end

-  def show; end
-
  def create
    @automation_rule = Current.account.automation_rules.new(automation_rules_permit)
    @automation_rule.actions = params[:actions]
@@ -20,6 +18,18 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
    @automation_rule
  end

+  def attach_file
+    file_blob = ActiveStorage::Blob.create_and_upload!(
+      key: nil,
+      io: params[:attachment].tempfile,
+      filename: params[:attachment].original_filename,
+      content_type: params[:attachment].content_type
+    )
+    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
+  end
+
+  def show; end
+
  def update
    ActiveRecord::Base.transaction do
      automation_rule_update
@@ -14,18 +14,8 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
      @facebook_inbox = Current.account.inboxes.create!(name: inbox_name, channel: facebook_channel)
      set_instagram_id(page_access_token, facebook_channel)
      set_avatar(@facebook_inbox, page_id)
-    end
-  rescue StandardError => e
-    ChatwootExceptionTracker.new(e).capture_exception
-    Rails.logger.error "Error in register_facebook_page: #{e.message}"
-    # Additional log statements
-    log_additional_info
-  end
-
-  def log_additional_info
-    Rails.logger.debug do
-      "user_access_token: #{params[:user_access_token]} , page_access_token: #{params[:page_access_token]} ,
-      page_id: #{params[:page_id]}, inbox_name: #{params[:inbox_name]}"
+    rescue StandardError => e
+      ChatwootExceptionTracker.new(e).capture_exception
    end
  end

@@ -40,8 +30,6 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController

    instagram_id = response['instagram_business_account']['id']
    facebook_channel.update(instagram_id: instagram_id)
-  rescue StandardError => e
-    Rails.logger.error "Error in set_instagram_id: #{e.message}"
  end

  # get params[:inbox_id], current_account. params[:omniauth_token]
@@ -73,7 +61,6 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
      fb_page&.reauthorized!
    rescue StandardError => e
      ChatwootExceptionTracker.new(e).capture_exception
-      Rails.logger.error "Error in update_fb_page: #{e.message}"
    end
  end

@@ -90,7 +77,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
    koala = Koala::Facebook::OAuth.new(GlobalConfigService.load('FB_APP_ID', ''), GlobalConfigService.load('FB_APP_SECRET', ''))
    koala.exchange_access_token_info(omniauth_token)['access_token']
  rescue StandardError => e
-    Rails.logger.error "Error in long_lived_token: #{e.message}"
+    Rails.logger.error e
  end

  def mark_already_existing_facebook_pages(data)
@@ -6,21 +6,21 @@ class Api::V1::Accounts::CampaignsController < Api::V1::Accounts::BaseController
    @campaigns = Current.account.campaigns
  end

-  def show; end
-
  def create
    @campaign = Current.account.campaigns.create!(campaign_params)
  end

-  def update
-    @campaign.update!(campaign_params)
-  end
-
  def destroy
    @campaign.destroy!
    head :ok
  end

+  def show; end
+
+  def update
+    @campaign.update!(campaign_params)
+  end
+
  private

  def campaign
@@ -9,8 +9,6 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
    @categories = @portal.categories.search(params)
  end

-  def show; end
-
  def create
    @category = @portal.categories.create!(category_params)
    @category.related_categories << related_categories_records
@@ -19,6 +17,8 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
    @category.save!
  end

+  def show; end
+
  def update
    @category.update!(category_params)
    @category.related_categories = related_categories_records if related_categories_records.any?
@@ -18,11 +18,7 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
  end

  def authenticate_twilio
-    client = if permitted_params[:api_key_sid].present?
-               Twilio::REST::Client.new(permitted_params[:api_key_sid], permitted_params[:auth_token], permitted_params[:account_sid])
-             else
-               Twilio::REST::Client.new(permitted_params[:account_sid], permitted_params[:auth_token])
-             end
+    client = Twilio::REST::Client.new(permitted_params[:account_sid], permitted_params[:auth_token])
    client.messages.list(limit: 1)
  end

@@ -44,7 +40,6 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
    @twilio_channel = Current.account.twilio_sms.create!(
      account_sid: permitted_params[:account_sid],
      auth_token: permitted_params[:auth_token],
-      api_key_sid: permitted_params[:api_key_sid],
      messaging_service_sid: permitted_params[:messaging_service_sid].presence,
      phone_number: phone_number,
      medium: medium
@@ -57,7 +52,7 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:

  def permitted_params
    params.require(:twilio_channel).permit(
-      :account_id, :messaging_service_sid, :phone_number, :account_sid, :auth_token, :name, :medium, :api_key_sid
+      :account_id, :messaging_service_sid, :phone_number, :account_sid, :auth_token, :name, :medium
    )
  end
 end
@@ -1,13 +1,11 @@
 class Api::V1::Accounts::Contacts::ContactInboxesController < Api::V1::Accounts::Contacts::BaseController
-  include HmacConcern
  before_action :ensure_inbox, only: [:create]

  def create
    @contact_inbox = ContactInboxBuilder.new(
      contact: @contact,
      inbox: @inbox,
-      source_id: params[:source_id],
-      hmac_verified: hmac_verified?
+      source_id: params[:source_id]
    ).perform
  end

@@ -5,21 +5,21 @@ class Api::V1::Accounts::Contacts::NotesController < Api::V1::Accounts::Contacts
    @notes = @contact.notes.latest.includes(:user)
  end

-  def show; end
-
  def create
    @note = @contact.notes.create!(note_params)
  end

-  def update
-    @note.update(note_params)
-  end
-
  def destroy
    @note.destroy!
    head :ok
  end

+  def show; end
+
+  def update
+    @note.update(note_params)
+  end
+
  private

  def note
@@ -4,7 +4,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
  sort_on :name, internal_name: :order_on_name, type: :scope, scope_params: [:direction]
  sort_on :phone_number, type: :string
  sort_on :last_activity_at, internal_name: :order_on_last_activity_at, type: :scope, scope_params: [:direction]
-  sort_on :created_at, internal_name: :order_on_created_at, type: :scope, scope_params: [:direction]
  sort_on :company, internal_name: :order_on_company_name, type: :scope, scope_params: [:direction]
  sort_on :city, internal_name: :order_on_city, type: :scope, scope_params: [:direction]
  sort_on :country, internal_name: :order_on_country_name, type: :scope, scope_params: [:direction]
@@ -18,7 +17,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController

  def index
    @contacts_count = resolved_contacts.count
-    @contacts = fetch_contacts(resolved_contacts)
+    @contacts = fetch_contacts_with_conversation_count(resolved_contacts)
  end

  def search
@@ -29,7 +28,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
      search: "%#{params[:q].strip}%"
    )
    @contacts_count = contacts.count
-    @contacts = fetch_contacts(contacts)
+    @contacts = fetch_contacts_with_conversation_count(contacts)
  end

  def import
@@ -43,12 +42,6 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    head :ok
  end

-  def export
-    column_names = params['column_names']
-    Account::ContactsExportJob.perform_later(Current.account.id, column_names)
-    head :ok, message: I18n.t('errors.contacts.export.success')
-  end
-
  # returns online contacts
  def active
    contacts = Current.account.contacts.where(id: ::OnlineStatusTracker
@@ -63,7 +56,7 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    result = ::Contacts::FilterService.new(params.permit!, current_user).perform
    contacts = result[:contacts]
    @contacts_count = result[:count]
-    @contacts = fetch_contacts(contacts)
+    @contacts = fetch_contacts_with_conversation_count(contacts)
  end

  def contactable_inboxes
@@ -125,14 +118,17 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
    @current_page = params[:page] || 1
  end

-  def fetch_contacts(contacts)
-    contacts_with_avatar = filtrate(contacts)
-                           .includes([{ avatar_attachment: [:blob] }])
-                           .page(@current_page).per(RESULTS_PER_PAGE)
+  def fetch_contacts_with_conversation_count(contacts)
+    conversation_count_sub_query = 'SELECT COUNT(*) FROM "conversations" WHERE "conversations"."contact_id" = "contacts"."id"'
+    contacts_with_conversation_count = filtrate(contacts)
+                                       .select("contacts.*, (#{conversation_count_sub_query}) as conversations_count")
+                                       .group('contacts.id')
+                                       .includes([{ avatar_attachment: [:blob] }])
+                                       .page(@current_page).per(RESULTS_PER_PAGE)

-    return contacts_with_avatar.includes([{ contact_inboxes: [:inbox] }]) if @include_contact_inboxes
+    return contacts_with_conversation_count.includes([{ contact_inboxes: [:inbox] }]) if @include_contact_inboxes

-    contacts_with_avatar
+    contacts_with_conversation_count
  end

  def build_contact_inbox
@@ -1,4 +1,5 @@
 class Api::V1::Accounts::Conversations::BaseController < Api::V1::Accounts::BaseController
+  include EnsureCurrentAccountHelper
  before_action :conversation

  private
@@ -1,7 +1,6 @@
 class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseController
  include Events::Types
  include DateRangeHelper
-  include HmacConcern

  before_action :conversation, except: [:index, :meta, :search, :create, :filter]
  before_action :inbox, :contact, :contact_inbox, only: [:create]
@@ -23,12 +22,6 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    @conversations_count = result[:count]
  end

-  def attachments
-    @attachments = @conversation.attachments
-  end
-
-  def show; end
-
  def create
    ActiveRecord::Base.transaction do
      @conversation = ConversationBuilder.new(params: params, contact_inbox: @contact_inbox).perform
@@ -36,6 +29,8 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    end
  end

+  def show; end
+
  def filter
    result = ::Conversations::FilterService.new(params.permit!, current_user).perform
    @conversations = result[:conversations]
@@ -69,14 +64,13 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    assign_conversation if @conversation.status == 'open' && Current.user.is_a?(User) && Current.user&.agent?
  end

-  def toggle_priority
-    @conversation.toggle_priority(params[:priority])
-    head :ok
-  end
-
  def toggle_typing_status
-    typing_status_manager = ::Conversations::TypingStatusManager.new(@conversation, current_user, params)
-    typing_status_manager.toggle_typing_status
+    case params[:typing_status]
+    when 'on'
+      trigger_typing_event(CONVERSATION_TYPING_ON, params[:is_private])
+    when 'off'
+      trigger_typing_event(CONVERSATION_TYPING_OFF, params[:is_private])
+    end
    head :ok
  end

@@ -105,6 +99,9 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
  end

  def set_conversation_status
+    # TODO: temporary fallback for the old bot status in conversation, we will remove after couple of releases
+    # commenting this out to see if there are any errors, if not we can remove this in subsequent releases
+    # status = params[:status] == 'bot' ? 'pending' : params[:status]
    @conversation.status = params[:status]
    @conversation.snoozed_until = parse_date_time(params[:snoozed_until].to_s) if params[:snoozed_until]
  end
@@ -114,6 +111,11 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    @conversation.update_assignee(@agent)
  end

+  def trigger_typing_event(event, is_private)
+    user = current_user.presence || @resource
+    Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: user, is_private: is_private)
+  end
+
  def conversation
    @conversation ||= Current.account.conversations.find_by!(display_id: params[:id])
    authorize @conversation.inbox, :show?
@@ -150,8 +152,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
    ContactInboxBuilder.new(
      contact: @contact,
      inbox: @inbox,
-      source_id: params[:source_id],
-      hmac_verified: hmac_verified?
+      source_id: params[:source_id]
    ).perform
  end

@@ -34,12 +34,9 @@ class Api::V1::Accounts::CsatSurveyResponsesController < Api::V1::Accounts::Base
  end

  def set_csat_survey_responses
-    base_query = Current.account.csat_survey_responses.includes([:conversation, :assigned_agent, :contact])
-    @csat_survey_responses = filtrate(base_query).filter_by_created_at(range)
-                                                 .filter_by_assigned_agent_id(params[:user_ids])
-                                                 .filter_by_inbox_id(params[:inbox_id])
-                                                 .filter_by_team_id(params[:team_id])
-                                                 .filter_by_rating(params[:rating])
+    @csat_survey_responses = filtrate(
+      Current.account.csat_survey_responses.includes([:conversation, :assigned_agent, :contact])
+    ).filter_by_created_at(range).filter_by_assigned_agent_id(params[:user_ids])
  end

  def set_current_page_surveys
@@ -1,5 +1,4 @@
 class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseController
-  before_action :check_authorization
  before_action :fetch_custom_filters, except: [:create]
  before_action :fetch_custom_filter, only: [:show, :update, :destroy]
  DEFAULT_FILTER_TYPE = 'conversation'.freeze
@@ -12,7 +11,6 @@ class Api::V1::Accounts::CustomFiltersController < Api::V1::Accounts::BaseContro
    @custom_filter = current_user.custom_filters.create!(
      permitted_payload.merge(account_id: Current.account.id)
    )
-    render json: { error: @custom_filter.errors.messages }, status: :unprocessable_entity and return unless @custom_filter.valid?
  end

  def update
@@ -2,11 +2,6 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
  before_action :fetch_inbox
  before_action :current_agents_ids, only: [:create, :update]

-  def show
-    authorize @inbox, :show?
-    fetch_updated_agents
-  end
-
  def create
    authorize @inbox, :create?
    ActiveRecord::Base.transaction do
@@ -15,6 +10,11 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
    fetch_updated_agents
  end

+  def show
+    authorize @inbox, :show?
+    fetch_updated_agents
+  end
+
  def update
    authorize @inbox, :update?
    update_agents_list
@@ -44,7 +44,26 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  def update
    @inbox.update!(permitted_params.except(:channel))
    update_inbox_working_hours
-    update_channel if channel_update_required?
+    channel_attributes = get_channel_attributes(@inbox.channel_type)
+
+    # Inbox update doesn't necessarily need channel attributes
+    return if permitted_params(channel_attributes)[:channel].blank?
+
+    if @inbox.inbox_type == 'Email'
+      begin
+        validate_email_channel(channel_attributes)
+      rescue StandardError => e
+        render json: { message: e }, status: :unprocessable_entity and return
+      end
+      @inbox.channel.reauthorized!
+    end
+
+    @inbox.channel.update!(permitted_params(channel_attributes)[:channel])
+    update_channel_feature_flags
+  end
+
+  def update_inbox_working_hours
+    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
  end

  def agent_bot
@@ -63,7 +82,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  end

  def destroy
-    ::DeleteObjectJob.perform_later(@inbox, Current.user, request.ip) if @inbox.present?
+    ::DeleteObjectJob.perform_later(@inbox) if @inbox.present?
    render status: :ok, json: { message: I18n.t('messages.inbox_deletetion_response') }
  end

@@ -84,35 +103,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
    account_channels_method.create!(permitted_params(channel_type_from_params::EDITABLE_ATTRS)[:channel].except(:type))
  end

-  def update_inbox_working_hours
-    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
-  end
-
-  def update_channel
-    channel_attributes = get_channel_attributes(@inbox.channel_type)
-    return if permitted_params(channel_attributes)[:channel].blank?
-
-    validate_and_update_email_channel(channel_attributes) if @inbox.inbox_type == 'Email'
-
-    reauthorize_and_update_channel(channel_attributes)
-    update_channel_feature_flags
-  end
-
-  def channel_update_required?
-    permitted_params(get_channel_attributes(@inbox.channel_type))[:channel].present?
-  end
-
-  def validate_and_update_email_channel(channel_attributes)
-    validate_email_channel(channel_attributes)
-  rescue StandardError => e
-    render json: { message: e }, status: :unprocessable_entity and return
-  end
-
-  def reauthorize_and_update_channel(channel_attributes)
-    @inbox.channel.reauthorized! if @inbox.channel.respond_to?(:reauthorized!)
-    @inbox.channel.update!(permitted_params(channel_attributes)[:channel])
-  end
-
  def update_channel_feature_flags
    return unless @inbox.web_widget?
    return unless permitted_params(Channel::WebWidget::EDITABLE_ATTRS)[:channel].key? :selected_feature_flags
@@ -124,13 +114,10 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
  def inbox_attributes
    [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
     :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved,
-     :lock_to_single_conversation, :portal_id, :sender_name_type, :business_name]
+     :lock_to_single_conversation]
  end

  def permitted_params(channel_attributes = [])
-    # We will remove this line after fixing https://linear.app/chatwoot/issue/CW-1567/null-value-passed-as-null-string-to-backend
-    params.each { |k, v| params[k] = params[k] == 'null' ? nil : v }
-
    params.permit(
      *inbox_attributes,
      channel: [:type, *channel_attributes]
@@ -1,5 +1,5 @@
 class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::BaseController
-  before_action :fetch_hook, except: [:create]
+  before_action :fetch_hook, only: [:update, :destroy]
  before_action :check_authorization

  def create
@@ -10,10 +10,6 @@ class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::Base
    @hook.update!(permitted_params.slice(:status, :settings))
  end

-  def process_event
-    render json: { message: @hook.process_event(params[:event]) }
-  end
-
  def destroy
    @hook.destroy!
    head :ok
@@ -1,27 +1,27 @@
 class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::BaseController
  before_action :check_admin_authorization?
-  before_action :fetch_hook, only: [:update, :destroy, :list_all_channels]
-
-  def list_all_channels
-    @channels = channel_builder.fetch_channels
-  end
+  before_action :fetch_hook, only: [:update, :destroy]

  def create
-    hook_builder = Integrations::Slack::HookBuilder.new(
-      account: Current.account,
-      code: params[:code],
-      inbox_id: params[:inbox_id]
-    )
-    @hook = hook_builder.perform
+    ActiveRecord::Base.transaction do
+      builder = Integrations::Slack::HookBuilder.new(
+        account: Current.account,
+        code: params[:code],
+        inbox_id: params[:inbox_id]
+      )
+      @hook = builder.perform
+      create_chatwoot_slack_channel
+    end
  end

  def update
-    @hook = channel_builder.update(permitted_params[:reference_id])
-    render json: { error: I18n.t('errors.slack.invalid_channel_id') }, status: :unprocessable_entity if @hook.blank?
+    create_chatwoot_slack_channel
+    render json: @hook
  end

  def destroy
    @hook.destroy!
+
    head :ok
  end

@@ -31,11 +31,11 @@ class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::Base
    @hook = Integrations::Hook.where(account: Current.account).find_by(app_id: 'slack')
  end

-  def channel_builder
-    Integrations::Slack::ChannelBuilder.new(hook: @hook)
-  end
-
-  def permitted_params
-    params.permit(:reference_id)
+  def create_chatwoot_slack_channel
+    channel = params[:channel] || 'customer-conversations'
+    builder = Integrations::Slack::ChannelBuilder.new(
+      hook: @hook, channel: channel
+    )
+    builder.perform
  end
 end
@@ -6,10 +6,6 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
    @macros = Macro.with_visibility(current_user, params)
  end

-  def show
-    head :not_found if @macro.nil?
-  end
-
  def create
    @macro = Current.account.macros.new(macros_with_user.merge(created_by_id: current_user.id))
    @macro.set_visibility(current_user, permitted_params)
@@ -22,6 +18,25 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
    @macro
  end

+  def show
+    head :not_found if @macro.nil?
+  end
+
+  def destroy
+    @macro.destroy!
+    head :ok
+  end
+
+  def attach_file
+    file_blob = ActiveStorage::Blob.create_and_upload!(
+      key: nil,
+      io: params[:attachment].tempfile,
+      filename: params[:attachment].original_filename,
+      content_type: params[:attachment].content_type
+    )
+    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
+  end
+
  def update
    ActiveRecord::Base.transaction do
      @macro.update!(macros_with_user)
@@ -34,11 +49,6 @@ class Api::V1::Accounts::MacrosController < Api::V1::Accounts::BaseController
    end
  end

-  def destroy
-    @macro.destroy!
-    head :ok
-  end
-
  def execute
    ::MacrosExecutionJob.perform_later(@macro, conversation_ids: params[:conversation_ids], user: Current.user)

@@ -1,7 +1,7 @@
 class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
  include ::FileTypeHelper

-  before_action :fetch_portal, except: [:index, :create]
+  before_action :fetch_portal, except: [:index, :create, :attach_file]
  before_action :check_authorization
  before_action :set_current_page, only: [:index]

@@ -30,7 +30,7 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    ActiveRecord::Base.transaction do
      @portal.update!(portal_params) if params[:portal].present?
      # @portal.custom_domain = parsed_custom_domain
-      process_attached_logo if params[:blob_id].present?
+      process_attached_logo
    rescue StandardError => e
      Rails.logger.error e
      render json: { error: @portal.errors.messages }.to_json, status: :unprocessable_entity
@@ -53,6 +53,16 @@ class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
    @portal.logo.attach(blob)
  end

+  def attach_file
+    file_blob = ActiveStorage::Blob.create_and_upload!(
+      key: nil,
+      io: params[:logo].tempfile,
+      filename: params[:logo].original_filename,
+      content_type: params[:logo].content_type
+    )
+    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
+  end
+
  private

  def fetch_portal
@@ -14,11 +14,6 @@ class Api::V1::AccountsController < Api::BaseController
              CustomExceptions::Account::UserErrors,
              with: :render_error_response

-  def show
-    @latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
-    render 'api/v1/accounts/show', format: :json
-  end
-
  def create
    @user, @account = AccountBuilder.new(
      account_name: account_params[:account_name],
@@ -37,10 +32,14 @@ class Api::V1::AccountsController < Api::BaseController
  end

  def cache_keys
-    expires_in 10.seconds, public: false, stale_while_revalidate: 5.minutes
    render json: { cache_keys: get_cache_keys }, status: :ok
  end

+  def show
+    @latest_chatwoot_version = ::Redis::Alfred.get(::Redis::Alfred::LATEST_CHATWOOT_VERSION)
+    render 'api/v1/accounts/show', format: :json
+  end
+
  def update
    @account.update!(account_params.slice(:name, :locale, :domain, :support_email, :auto_resolve_duration))
  end
@@ -1,13 +0,0 @@
-class Api::V1::UploadController < Api::BaseController
-  def create
-    file_blob = ActiveStorage::Blob.create_and_upload!(
-      key: nil,
-      io: params[:attachment].tempfile,
-      filename: params[:attachment].original_filename,
-      content_type: params[:attachment].content_type
-    )
-    file_blob.save!
-
-    render json: { file_url: url_for(file_blob), blob_key: file_blob.key, blob_id: file_blob.id }
-  end
-end
@@ -17,8 +17,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
      @message.update!(submitted_email: contact_email)
      ContactIdentifyAction.new(
        contact: @contact,
-        params: { email: contact_email, name: contact_name },
-        retain_original_contact_name: true
+        params: { email: contact_email, name: contact_name }
      ).perform
    else
      @message.update!(message_update_params[:message])
@@ -49,8 +48,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
  def message_finder_params
    {
      filter_internal_messages: true,
-      before: permitted_params[:before],
-      after: permitted_params[:after]
+      before: permitted_params[:before]
    }
  end

@@ -64,7 +62,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController

  def permitted_params
    # timestamp parameter is used in create conversation method
-    params.permit(:id, :before, :after, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id])
+    params.permit(:id, :before, :website_token, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id])
  end

  def set_message
@@ -1,7 +1,5 @@
 class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
  include Api::V2::Accounts::ReportsHelper
-  include Api::V2::Accounts::HeatmapHelper
-
  before_action :check_authorization

  def index
@@ -36,9 +34,6 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController

  def conversation_traffic
    @report_data = generate_conversations_heatmap_report
-    timezone_offset = (params[:timezone_offset] || 0).to_f
-    @timezone = ActiveSupport::TimeZone[timezone_offset]
-
    generate_csv('conversation_traffic_reports', 'api/v2/accounts/reports/conversation_traffic')
  end

@@ -72,16 +67,14 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
  def current_summary_params
    common_params.merge({
                          since: range[:current][:since],
-                          until: range[:current][:until],
-                          timezone_offset: params[:timezone_offset]
+                          until: range[:current][:until]
                        })
  end

  def previous_summary_params
    common_params.merge({
                          since: range[:previous][:since],
-                          until: range[:previous][:until],
-                          timezone_offset: params[:timezone_offset]
+                          until: range[:previous][:until]
                        })
  end

@@ -3,7 +3,7 @@ class ApiController < ApplicationController

  def index
    render json: { version: Chatwoot.config[:version],
-                   timestamp: Time.now.utc.to_fs(:db),
+                   timestamp: Time.now.utc.to_formatted_s(:db),
                   queue_services: redis_status,
                   data_services: postgres_status }
  end
@@ -8,7 +8,7 @@ module EnsureCurrentAccountHelper

  def ensure_current_account
    account = Account.find(params[:account_id])
-    render_unauthorized('Account is suspended') and return unless account.active?
+    ensure_account_is_active?(account)

    if current_user
      account_accessible_for_user?(account)
@@ -27,4 +27,8 @@ module EnsureCurrentAccountHelper
  def account_accessible_for_bot?(account)
    render_unauthorized('You are not authorized to access this account') unless @resource.agent_bot_inboxes.find_by(account_id: account.id)
  end
+
+  def ensure_account_is_active?(account)
+    render_unauthorized('Account is suspended') unless account.active?
+  end
 end
@@ -1,5 +0,0 @@
-module HmacConcern
-  def hmac_verified?
-    ActiveModel::Type::Boolean.new.cast(params[:hmac_verified]).present?
-  end
-end
@@ -1,7 +1,6 @@
 class DashboardController < ActionController::Base
  include SwitchLocale

-  before_action :set_application_pack
  before_action :set_global_config
  around_action :switch_locale
  before_action :ensure_installation_onboarding, only: [:index]
@@ -15,7 +14,7 @@ class DashboardController < ActionController::Base

  def set_global_config
    @global_config = GlobalConfig.get(
-      'LOGO', 'LOGO_DARK', 'LOGO_THUMBNAIL',
+      'LOGO', 'LOGO_THUMBNAIL',
      'INSTALLATION_NAME',
      'WIDGET_BRAND_URL', 'TERMS_URL',
      'PRIVACY_URL',
@@ -55,18 +54,9 @@ class DashboardController < ActionController::Base
      VAPID_PUBLIC_KEY: VapidService.public_key,
      ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
      FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
-      FACEBOOK_API_VERSION: 'v17.0',
+      FACEBOOK_API_VERSION: 'v14.0',
      IS_ENTERPRISE: ChatwootApp.enterprise?,
-      AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', ''),
-      GIT_SHA: GIT_HASH
+      AZURE_APP_ID: ENV.fetch('AZURE_APP_ID', '')
    }
  end
-
-  def set_application_pack
-    @application_pack = if request.path.include?('/auth') || request.path.include?('/login')
-                          'v3app'
-                        else
-                          'application'
-                        end
-  end
 end
@@ -4,16 +4,6 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
  skip_before_action :require_no_authentication, raise: false
  skip_before_action :authenticate_user!, raise: false

-  def create
-    @user = User.find_by(email: params[:email])
-    if @user
-      @user.send_reset_password_instructions
-      build_response(I18n.t('messages.reset_password_success'), 200)
-    else
-      build_response(I18n.t('messages.reset_password_failure'), 404)
-    end
-  end
-
  def update
    # params: reset_password_token, password, password_confirmation
    original_token = params[:reset_password_token]
@@ -27,6 +17,16 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
    end
  end

+  def create
+    @user = User.find_by(email: params[:email])
+    if @user
+      @user.send_reset_password_instructions
+      build_response(I18n.t('messages.reset_password_success'), 200)
+    else
+      build_response(I18n.t('messages.reset_password_failure'), 404)
+    end
+  end
+
  private

  def reset_password_and_confirmation(recoverable)
@@ -1,4 +1,4 @@
-class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
+class DeviseOverrides::SessionsController < ::DeviseTokenAuth::SessionsController
  # Prevent session parameter from being passed
  # Unpermitted parameter: session
  wrap_parameters format: []
@@ -37,5 +37,3 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
    @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
  end
 end
-
-DeviseOverrides::SessionsController.prepend_mod_with('DeviseOverrides::SessionsController')
@@ -1,4 +1,4 @@
-class DeviseOverrides::TokenValidationsController < DeviseTokenAuth::TokenValidationsController
+class DeviseOverrides::TokenValidationsController < ::DeviseTokenAuth::TokenValidationsController
  def validate_token
    # @resource will have been set by set_user_by_token concern
    if @resource
@@ -1,12 +1,12 @@
 class Platform::Api::V1::AccountsController < PlatformController
-  def show; end
-
  def create
    @resource = Account.create!(account_params)
    update_resource_features
    @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
  end

+  def show; end
+
  def update
    @resource.assign_attributes(account_params)
    update_resource_features
@@ -6,14 +6,14 @@ class Platform::Api::V1::AgentBotsController < PlatformController
    @resources = @platform_app.platform_app_permissibles.where(permissible_type: 'AgentBot').all
  end

-  def show; end
-
  def create
    @resource = AgentBot.new(agent_bot_params)
    @resource.save!
    @platform_app.platform_app_permissibles.find_or_create_by(permissible: @resource)
  end

+  def show; end
+
  def update
    @resource.update!(agent_bot_params)
  end
@@ -5,8 +5,6 @@ class Platform::Api::V1::UsersController < PlatformController
  before_action(only: [:login]) { set_resource }
  before_action(only: [:login]) { validate_platform_app_permissible }

-  def show; end
-
  def create
    @resource = (User.find_by(email: user_params[:email]) || User.new(user_params))
    @resource.skip_confirmation!
@@ -18,6 +16,8 @@ class Platform::Api::V1::UsersController < PlatformController
    render json: { url: @resource.generate_sso_link }
  end

+  def show; end
+
  def update
    @resource.assign_attributes(user_update_params)

@@ -2,8 +2,6 @@ class Public::Api::V1::Inboxes::ContactsController < Public::Api::V1::InboxesCon
  before_action :contact_inbox, except: [:create]
  before_action :process_hmac

-  def show; end
-
  def create
    source_id = params[:source_id] || SecureRandom.uuid
    @contact_inbox = ::ContactInboxWithContactBuilder.new(
@@ -13,6 +11,8 @@ class Public::Api::V1::Inboxes::ContactsController < Public::Api::V1::InboxesCon
    ).perform
  end

+  def show; end
+
  def update
    contact_identify_action = ContactIdentifyAction.new(
      contact: @contact_inbox.contact,
@@ -1,7 +1,4 @@
 class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::InboxesController
-  include Events::Types
-  before_action :set_conversation, only: [:toggle_typing, :update_last_seen]
-
  def index
    @conversations = @contact_inbox.hmac_verified? ? @contact.conversations : @contact_inbox.conversations
  end
@@ -10,36 +7,12 @@ class Public::Api::V1::Inboxes::ConversationsController < Public::Api::V1::Inbox
    @conversation = create_conversation
  end

-  def toggle_typing
-    case params[:typing_status]
-    when 'on'
-      trigger_typing_event(CONVERSATION_TYPING_ON)
-    when 'off'
-      trigger_typing_event(CONVERSATION_TYPING_OFF)
-    end
-    head :ok
-  end
-
-  def update_last_seen
-    @conversation.contact_last_seen_at = DateTime.now.utc
-    @conversation.save!
-    head :ok
-  end
-
  private

-  def set_conversation
-    @conversation = @contact_inbox.contact.conversations.find_by!(display_id: params[:id])
-  end
-
  def create_conversation
    ::Conversation.create!(conversation_params)
  end

-  def trigger_typing_event(event)
-    Rails.configuration.dispatcher.dispatch(event, Time.zone.now, conversation: @conversation, user: @conversation.contact)
-  end
-
  def conversation_params
    {
      account_id: @contact_inbox.contact.account_id,
@@ -1,31 +1,22 @@
 class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::BaseController
  before_action :ensure_custom_domain_request, only: [:show, :index]
  before_action :portal
-  before_action :set_category, except: [:index, :show]
+  before_action :set_category, except: [:index]
  before_action :set_article, only: [:show]
  layout 'portal'

  def index
    @articles = @portal.articles
    @articles = @articles.search(list_params) if list_params.present?
-    order_by_sort_param
-    @articles.page(list_params[:page]) if list_params[:page].present?
+    @articles.order(position: :asc)
  end

  def show; end

  private

-  def order_by_sort_param
-    @articles = if list_params[:sort].present? && list_params[:sort] == 'views'
-                  @articles.order_by_views
-                else
-                  @articles.order_by_position
-                end
-  end
-
  def set_article
-    @article = @portal.articles.find_by(slug: permitted_params[:article_slug])
+    @article = @category.articles.find(permitted_params[:id])
    @article.increment_view_count
    @parsed_content = render_article_content(@article.content)
  end
@@ -44,14 +35,16 @@ class Public::Api::V1::Portals::ArticlesController < Public::Api::V1::Portals::B
  end

  def list_params
-    params.permit(:query, :locale, :sort)
+    params.permit(:query, :locale)
  end

  def permitted_params
-    params.permit(:slug, :category_slug, :locale, :id, :article_slug)
+    params.permit(:slug, :category_slug, :locale, :id)
  end

  def render_article_content(content)
-    ChatwootMarkdownRenderer.new(content).render_article
+    # rubocop:disable Rails/OutputSafety
+    CommonMarker.render_html(content).html_safe
+    # rubocop:enable Rails/OutputSafety
  end
 end
@@ -1,19 +1,10 @@
 class Public::Api::V1::Portals::BaseController < PublicController
-  before_action :show_plain_layout
  around_action :set_locale
-  after_action :allow_iframe_requests

  private

-  def show_plain_layout
-    @is_plain_layout_enabled = params[:show_plain_layout] == 'true'
-  end
-
  def set_locale(&)
    switch_locale_with_portal(&) if params[:locale].present?
-    switch_locale_with_article(&) if params[:article_slug].present?
-
-    yield
  end

  def switch_locale_with_portal(&)
@@ -28,20 +19,4 @@ class Public::Api::V1::Portals::BaseController < PublicController

    I18n.with_locale(@locale, &)
  end
-
-  def switch_locale_with_article(&)
-    article = Article.find_by(slug: params[:article_slug])
-
-    @locale = if article.category.present?
-                article.category.locale
-              else
-                'en'
-              end
-
-    I18n.with_locale(@locale, &)
-  end
-
-  def allow_iframe_requests
-    response.headers.delete('X-Frame-Options') if @is_plain_layout_enabled
-  end
 end
@@ -45,24 +45,6 @@ class SuperAdmin::AccountsController < SuperAdmin::ApplicationController

  def seed
    Internal::SeedAccountJob.perform_later(requested_resource)
-    # rubocop:disable Rails/I18nLocaleTexts
    redirect_back(fallback_location: [namespace, requested_resource], notice: 'Account seeding triggered')
-    # rubocop:enable Rails/I18nLocaleTexts
-  end
-
-  def reset_cache
-    requested_resource.reset_cache_keys
-    # rubocop:disable Rails/I18nLocaleTexts
-    redirect_back(fallback_location: [namespace, requested_resource], notice: 'Cache keys cleared')
-    # rubocop:enable Rails/I18nLocaleTexts
-  end
-
-  def destroy
-    account = Account.find(params[:id])
-
-    DeleteObjectJob.perform_later(account) if account.present?
-    # rubocop:disable Rails/I18nLocaleTexts
-    redirect_back(fallback_location: [namespace, requested_resource], notice: 'Account deletion is in progress.')
-    # rubocop:enable Rails/I18nLocaleTexts
  end
 end
@@ -41,14 +41,4 @@ class SuperAdmin::AgentBotsController < SuperAdmin::ApplicationController

  # See https://administrate-prototype.herokuapp.com/customizing_controller_actions
  # for more information
-
-  def destroy_avatar
-    avatar = requested_resource.avatar
-    avatar.purge
-    redirect_back(fallback_location: super_admin_agent_bots_path)
-  end
-
-  def scoped_resource
-    resource_class.with_attached_avatar
-  end
 end
@@ -5,17 +5,6 @@ class SuperAdmin::InstanceStatusesController < SuperAdmin::ApplicationController
    sha
    postgres_status
    redis_metrics
-    chatwoot_edition
-  end
-
-  def chatwoot_edition
-    @metrics['Chatwoot edition'] = if ChatwootApp.enterprise?
-                                     'Enterprise'
-                                   elsif ChatwootApp.custom?
-                                     'Custom'
-                                   else
-                                     'Community'
-                                   end
  end

  def chatwoot_version
@@ -45,17 +45,6 @@ class SuperAdmin::UsersController < SuperAdmin::ApplicationController
  # empty values into nil values. It uses other APIs such as `resource_class`
  # and `dashboard`:
  #
-
-  def destroy_avatar
-    avatar = requested_resource.avatar
-    avatar.purge
-    redirect_back(fallback_location: super_admin_users_path)
-  end
-
-  def scoped_resource
-    resource_class.with_attached_avatar
-  end
-
  def resource_params
    permitted_params = super
    permitted_params.delete(:password) if permitted_params[:password].blank?
@@ -1,7 +1,7 @@
 class SwaggerController < ApplicationController
  def respond
    if Rails.env.development? || Rails.env.test?
-      render inline: Rails.root.join('swagger', derived_path).read
+      render inline: File.read(Rails.root.join('swagger', derived_path))
    else
      head :not_found
    end
@@ -14,7 +14,7 @@ class Twitter::CallbacksController < Twitter::BaseController
      redirect_to app_twitter_inbox_agents_url(account_id: account.id, inbox_id: inbox.id)
    end
  rescue StandardError => e
-    ChatwootExceptionTracker.new(e).capture_exception
+    Rails.logger.error e
    redirect_to twitter_app_redirect_url
  end

@@ -49,22 +49,10 @@ class Twitter::CallbacksController < Twitter::BaseController
      twitter_access_token_secret: parsed_body['oauth_token_secret'],
      profile_id: parsed_body['user_id']
    )
-    inbox = account.inboxes.create!(
+    account.inboxes.create!(
      name: parsed_body['screen_name'],
      channel: twitter_profile
    )
-    save_profile_image(inbox)
-    inbox
-  end
-
-  def save_profile_image(inbox)
-    response = twitter_client.user_show(screen_name: inbox.name)
-
-    return unless response.status.to_i == 200
-
-    parsed_user_profile = response.body
-
-    ::Avatar::AvatarFromUrlJob.perform_later(inbox, parsed_user_profile['profile_image_url_https'])
  end

  def permitted_params
@@ -41,7 +41,7 @@ class WidgetsController < ActionController::Base
      source_id: @auth_token_params[:source_id]
    )

-    @contact = @contact_inbox&.contact
+    @contact = @contact_inbox ? @contact_inbox.contact : nil
  end

  def build_contact
@@ -86,10 +86,7 @@ class AccountDashboard < Administrate::BaseDashboard
    "##{account.id} #{account.name}"
  end

-  # We do not use the action parameter but we still need to define it
-  # to prevent an error from being raised (wrong number of arguments)
-  # Reference: https://github.com/thoughtbot/administrate/pull/2356/files#diff-4e220b661b88f9a19ac527c50d6f1577ef6ab7b0bed2bfdf048e22e6bfa74a05R204
-  def permitted_attributes(action)
+  def permitted_attributes
    super + [limits: {}]
  end
 end
@@ -10,11 +10,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
  ATTRIBUTE_TYPES = {
    access_token: Field::HasOne,
    avatar_url: AvatarField,
-    avatar: Field::ActiveStorage.with_options(
-      destroy_url: proc do |_namespace, _resource, attachment|
-        [:avatar_super_admin_agent_bot, { attachment_id: attachment.id }]
-      end
-    ),
    id: Field::Number,
    name: Field::String,
    account: Field::BelongsTo.with_options(searchable: true, searchable_field: 'name', order: 'id DESC'),
@@ -41,7 +36,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
  # an array of attributes that will be displayed on the model's show page.
  SHOW_PAGE_ATTRIBUTES = %i[
    id
-    avatar_url
    account
    name
    description
@@ -53,7 +47,6 @@ class AgentBotDashboard < Administrate::BaseDashboard
  # on the model's form (`new` and `edit`) pages.
  FORM_ATTRIBUTES = %i[
    name
-    avatar
    account
    description
    outgoing_url
@@ -11,11 +11,6 @@ class UserDashboard < Administrate::BaseDashboard
    account_users: Field::HasMany,
    id: Field::Number,
    avatar_url: AvatarField,
-    avatar: Field::ActiveStorage.with_options(
-      destroy_url: proc do |_namespace, _resource, attachment|
-        [:avatar_super_admin_user, { attachment_id: attachment.id }]
-      end
-    ),
    provider: Field::String,
    uid: Field::String,
    password: Field::Password,
@@ -74,7 +69,6 @@ class UserDashboard < Administrate::BaseDashboard
  # on the model's form (`new` and `edit`) pages.
  FORM_ATTRIBUTES = %i[
    name
-    avatar
    display_name
    email
    password
@@ -1,5 +1,2 @@
 class AccountDrop < BaseDrop
-  def name
-    @obj.try(:name)
-  end
 end
@@ -5,9 +5,7 @@ class ConversationFinder
  SORT_OPTIONS = {
    latest: 'latest',
    sort_on_created_at: 'sort_on_created_at',
-    last_user_message_at: 'last_user_message_at',
-    sort_on_priority: 'sort_on_priority',
-    sort_on_waiting_since: 'sort_on_waiting_since'
+    last_user_message_at: 'last_user_message_at'
  }.with_indifferent_access

  # assumptions
@@ -55,10 +53,9 @@ class ConversationFinder

    find_all_conversations
    filter_by_status unless params[:q]
-    filter_by_team
-    filter_by_labels
-    filter_by_query
-    filter_by_source_id
+    filter_by_team if @team
+    filter_by_labels if params[:labels]
+    filter_by_query if params[:q]
  end

  def set_inboxes
@@ -103,14 +100,12 @@ class ConversationFinder
    when 'participating'
      @conversations = current_user.participating_conversations.where(account_id: current_account.id)
    when 'unattended'
-      @conversations = @conversations.unattended
+      @conversations = @conversations.where(first_reply_created_at: nil)
    end
    @conversations
  end

  def filter_by_query
-    return unless params[:q]
-
    allowed_message_types = [Message.message_types[:incoming], Message.message_types[:outgoing]]
    @conversations = conversations.joins(:messages).where('messages.content ILIKE :search', search: "%#{params[:q]}%")
                                  .where(messages: { message_type: allowed_message_types }).includes(:messages)
@@ -125,24 +120,13 @@ class ConversationFinder
  end

  def filter_by_team
-    return unless @team
-
    @conversations = @conversations.where(team: @team)
  end

  def filter_by_labels
-    return unless params[:labels]
-
    @conversations = @conversations.tagged_with(params[:labels], any: true)
  end

-  def filter_by_source_id
-    return unless params[:source_id]
-
-    @conversations = @conversations.joins(:contact_inbox)
-    @conversations = @conversations.where(contact_inboxes: { source_id: params[:source_id] })
-  end
-
  def set_count_for_all_conversations
    [
      @conversations.assigned_to(current_user).count,
@@ -7,18 +7,12 @@ class EmailChannelFinder

  def perform
    channel = nil
-
+    recipient_mails = @email_object.to.to_a + @email_object.cc.to_a
    recipient_mails.each do |email|
      normalized_email = normalize_email_with_plus_addressing(email)
      channel = Channel::Email.find_by('lower(email) = ? OR lower(forward_to_email) = ?', normalized_email, normalized_email)
-
      break if channel.present?
    end
    channel
  end
-
-  def recipient_mails
-    recipient_addresses = @email_object.to.to_a + @email_object.cc.to_a + @email_object.bcc.to_a + [@email_object['X-Original-To'].try(:value)]
-    recipient_addresses.flatten.compact
-  end
 end
@@ -22,29 +22,11 @@ class MessageFinder

  def current_messages
    if @params[:after].present? && @params[:before].present?
-      messages_between(@params[:after].to_i, @params[:before].to_i)
+      messages.reorder('created_at asc').where('id >= ? AND id < ?', @params[:after].to_i, @params[:before].to_i).limit(1000)
    elsif @params[:before].present?
-      messages_before(@params[:before].to_i)
-    elsif @params[:after].present?
-      messages_after(@params[:after].to_i)
+      messages.reorder('created_at desc').where('id < ?', @params[:before].to_i).limit(20).reverse
    else
-      messages_latest
+      messages.reorder('created_at desc').limit(20).reverse
    end
  end
-
-  def messages_after(after_id)
-    messages.reorder('created_at asc').where('id > ?', after_id).limit(100)
-  end
-
-  def messages_before(before_id)
-    messages.reorder('created_at desc').where('id < ?', before_id).limit(20).reverse
-  end
-
-  def messages_between(after_id, before_id)
-    messages.reorder('created_at asc').where('id >= ? AND id < ?', after_id, before_id).limit(1000)
-  end
-
-  def messages_latest
-    messages.reorder('created_at desc').limit(20).reverse
-  end
 end
@@ -1,103 +0,0 @@
-module Api::V2::Accounts::HeatmapHelper
-  def generate_conversations_heatmap_report
-    timezone_data = generate_heatmap_data_for_timezone(params[:timezone_offset])
-
-    group_traffic_data(timezone_data)
-  end
-
-  private
-
-  def group_traffic_data(data)
-    # start with an empty array
-    result_arr = []
-
-    # pick all the unique dates from the data in ascending order
-    dates = data.pluck(:date).uniq.sort
-
-    # add the dates as the first row, leave an empty cell for the hour column
-    # e.g. [nil, '2023-01-01', '2023-1-02', '2023-01-03']
-    result_arr << ([nil] + dates)
-
-    # group the data by hour, we do not need to sort it, because the data is already sorted
-    # given it starts from the beginning of the day
-    # here each hour is a key, and the value is an array of all the items for that hour at each date
-    # e.g. hour = 1
-    # value = [{date: 2023-01-01, value: 1}, {date: 2023-01-02, value: 1}, {date: 2023-01-03, value: 1}, ...]
-    data.group_by { |d| d[:hour] }.each do |hour, items|
-      # create a new row for each hour
-      row = [hour]
-
-      # group the items by date, so we can easily access the value for each date
-      # grouped values will be a hasg with the date as the key, and the value as the value
-      # e.g. { '2023-01-01' => [{date: 2023-01-01, value: 1}], '2023-01-02' => [{date: 2023-01-02, value: 1}], ... }
-      grouped_values = items.group_by { |d| d[:date] }
-
-      # now for each unique date we have, we can access the value for that date and append it to the array
-      dates.each do |date|
-        row << (grouped_values[date][0][:value] if grouped_values[date].is_a?(Array))
-      end
-
-      # row will look like [22, 0, 0, 1, 4, 6, 7, 4]
-      # add the row to the result array
-
-      result_arr << row
-    end
-
-    # return the resultant array
-    # the result looks like this
-    # [
-    #   [nil, '2023-01-01', '2023-1-02', '2023-01-03'],
-    #   [0, 0, 0, 0],
-    #   [1, 0, 0, 0],
-    #   [2, 0, 0, 0],
-    #   [3, 0, 0, 0],
-    #   [4, 0, 0, 0],
-    # ]
-    result_arr
-  end
-
-  def generate_heatmap_data_for_timezone(offset)
-    timezone = ActiveSupport::TimeZone[offset]&.name
-    timezone_today = DateTime.now.in_time_zone(timezone).beginning_of_day
-
-    timezone_data_raw = generate_heatmap_data(timezone_today, offset)
-
-    transform_data(timezone_data_raw, false)
-  end
-
-  def generate_heatmap_data(date, offset)
-    report_params = {
-      type: :account,
-      group_by: 'hour',
-      metric: 'conversations_count',
-      business_hours: false
-    }
-
-    V2::ReportBuilder.new(Current.account, report_params.merge({
-                                                                 since: since_timestamp(date),
-                                                                 until: until_timestamp(date),
-                                                                 timezone_offset: offset
-                                                               })).build
-  end
-
-  def transform_data(data, zone_transform)
-    # rubocop:disable Rails/TimeZone
-    data.map do |d|
-      date = zone_transform ? Time.zone.at(d[:timestamp]) : Time.at(d[:timestamp])
-      {
-        date: date.to_date.to_s,
-        hour: date.hour,
-        value: d[:value]
-      }
-    end
-    # rubocop:enable Rails/TimeZone
-  end
-
-  def since_timestamp(date)
-    (date - 6.days).to_i.to_s
-  end
-
-  def until_timestamp(date)
-    date.to_i.to_s
-  end
-end
@@ -27,6 +27,27 @@ module Api::V2::Accounts::ReportsHelper
    end
  end

+  def generate_conversations_heatmap_report
+    report_params = {
+      type: :account,
+      group_by: 'hour',
+      since: params[:since],
+      until: params[:until],
+      metric: 'conversations_count',
+      business_hours: false
+    }
+    data = V2::ReportBuilder.new(Current.account, report_params).build
+
+    # data format is { timestamp: 1231242342, value: 3}
+    # we need to convert it to { date: "2020-01-01", hour: 12, value: 3}
+    #
+    # the generated report is **always** in UTC timezone
+    data.map do |d|
+      date = Time.zone.at(d[:timestamp]).to_s
+      [date, d[:value]]
+    end
+  end
+
  def generate_report(report_params)
    V2::ReportBuilder.new(
      Current.account,
@@ -1,21 +0,0 @@
-module BillingHelper
-  private
-
-  def default_plan?(account)
-    installation_config = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')
-    default_plan = installation_config&.value&.first
-
-    # Return false if not plans are configured, so that no checks are enforced
-    return false if default_plan.blank?
-
-    account.custom_attributes['plan_name'].nil? || account.custom_attributes['plan_name'] == default_plan['name']
-  end
-
-  def conversations_this_month(account)
-    account.conversations.where('created_at > ?', 30.days.ago).count
-  end
-
-  def non_web_inboxes(account)
-    account.inboxes.where.not(channel_type: Channel::WebWidget.to_s).count
-  end
-end
@@ -7,7 +7,7 @@ module DateRangeHelper
  def range
    return if params[:since].blank? || params[:until].blank?

-    parse_date_time(params[:since])...parse_date_time(params[:until])
+    parse_date_time(params[:since])..parse_date_time(params[:until])
  end

  def parse_date_time(datetime)
@@ -10,26 +10,4 @@ module EmailHelper
  def normalize_email_with_plus_addressing(email)
    "#{email.split('@').first.split('+').first}@#{email.split('@').last}".downcase
  end
-
-  def parse_email_variables(conversation, email)
-    case email
-    when modified_liquid_content(email)
-      template = Liquid::Template.parse(modified_liquid_content(email))
-      template.render(message_drops(conversation))
-    when URI::MailTo::EMAIL_REGEXP
-      email
-    end
-  end
-
-  def modified_liquid_content(email)
-    # This regex is used to match the code blocks in the content
-    # We don't want to process liquid in code blocks
-    email.gsub(/`(.*?)`/m, '{% raw %}`\\1`{% endraw %}')
-  end
-
-  def message_drops(conversation)
-    {
-      'contact' => ContactDrop.new(conversation.contact)
-    }
-  end
 end
@@ -7,6 +7,8 @@ module MessageFormatHelper
  end

  def render_message_content(message_content)
-    ChatwootMarkdownRenderer.new(message_content).render_message
+    # rubocop:disable Rails/OutputSafety
+    CommonMarker.render_html(message_content).html_safe
+    # rubocop:enable Rails/OutputSafety
  end
 end
@@ -17,36 +17,19 @@ module ReportHelper
  end

  def conversations_count
-    (get_grouped_values conversations).count
+    (get_grouped_values scope.conversations.where(account_id: account.id)).count
  end

  def incoming_messages_count
-    (get_grouped_values incoming_messages).count
+    (get_grouped_values scope.messages.where(account_id: account.id).incoming.unscope(:order)).count
  end

  def outgoing_messages_count
-    (get_grouped_values outgoing_messages).count
+    (get_grouped_values scope.messages.where(account_id: account.id).outgoing.unscope(:order)).count
  end

  def resolutions_count
-    (get_grouped_values resolutions).count
-  end
-
-  def conversations
-    scope.conversations.where(account_id: account.id, created_at: range)
-  end
-
-  def incoming_messages
-    scope.messages.where(account_id: account.id, created_at: range).incoming.unscope(:order)
-  end
-
-  def outgoing_messages
-    scope.messages.where(account_id: account.id, created_at: range).outgoing.unscope(:order)
-  end
-
-  def resolutions
-    scope.reporting_events.joins(:conversation).select(:conversation_id).where(account_id: account.id, name: :conversation_resolved,
-                                                                               conversations: { status: :resolved }, created_at: range).distinct
+    (get_grouped_values scope.conversations.where(account_id: account.id).resolved).count
  end

  def avg_first_response_time
@@ -56,13 +39,6 @@ module ReportHelper
    grouped_reporting_events.average(:value)
  end

-  def reply_time
-    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'reply_time', account_id: account.id))
-    return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
-
-    grouped_reporting_events.average(:value)
-  end
-
  def avg_resolution_time
    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'conversation_resolved', account_id: account.id))
    return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
@@ -73,35 +49,17 @@ module ReportHelper
  def avg_resolution_time_summary
    reporting_events = scope.reporting_events
                            .where(name: 'conversation_resolved', account_id: account.id, created_at: range)
-    avg_rt = if params[:business_hours].present?
-               reporting_events.average(:value_in_business_hours)
-             else
-               reporting_events.average(:value)
-             end
+    avg_rt = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)

    return 0 if avg_rt.blank?

    avg_rt
  end

-  def reply_time_summary
-    reporting_events = scope.reporting_events
-                            .where(name: 'reply_time', account_id: account.id, created_at: range)
-    reply_time = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)
-
-    return 0 if reply_time.blank?
-
-    reply_time
-  end
-
  def avg_first_response_time_summary
    reporting_events = scope.reporting_events
                            .where(name: 'first_response', account_id: account.id, created_at: range)
-    avg_frt = if params[:business_hours].present?
-                reporting_events.average(:value_in_business_hours)
-              else
-                reporting_events.average(:value)
-              end
+    avg_frt = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)

    return 0 if avg_frt.blank?

@@ -2,15 +2,10 @@
  <div
    v-if="!authUIFlags.isFetching"
    id="app"
-    class="app-wrapper h-full flex-grow-0 min-h-0 w-full"
+    class="app-wrapper app-root"
    :class="{ 'app-rtl--wrapper': isRTLView }"
-    :dir="isRTLView ? 'rtl' : 'ltr'"
  >
    <update-banner :latest-chatwoot-version="latestChatwootVersion" />
-    <template v-if="!accountUIFlags.isFetchingItem && currentAccountId">
-      <payment-pending-banner />
-      <upgrade-banner />
-    </template>
    <transition name="fade" mode="out-in">
      <router-view />
    </transition>
@@ -30,12 +25,9 @@ import AddAccountModal from '../dashboard/components/layout/sidebarComponents/Ad
 import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification';
 import UpdateBanner from './components/app/UpdateBanner.vue';
-import UpgradeBanner from './components/app/UpgradeBanner.vue';
-import PaymentPendingBanner from './components/app/PaymentPendingBanner.vue';
 import vueActionCable from './helper/actionCable';
 import WootSnackbarBox from './components/SnackbarContainer';
 import rtlMixin from 'shared/mixins/rtlMixin';
-import { setColorTheme } from './helper/themeHelper';
 import {
  registerSubscription,
  verifyServiceWorkerExistence,
@@ -49,9 +41,7 @@ export default {
    LoadingState,
    NetworkNotification,
    UpdateBanner,
-    PaymentPendingBanner,
    WootSnackbarBox,
-    UpgradeBanner,
  },

  mixins: [rtlMixin],
@@ -69,7 +59,6 @@ export default {
      currentUser: 'getCurrentUser',
      globalConfig: 'globalConfig/get',
      authUIFlags: 'getAuthUIFlags',
-      accountUIFlags: 'accounts/getUIFlags',
      currentAccountId: 'getCurrentAccountId',
    }),
    hasAccounts() {
@@ -91,18 +80,9 @@ export default {
    },
  },
  mounted() {
-    this.initializeColorTheme();
-    this.listenToThemeChanges();
    this.setLocale(window.chatwootConfig.selectedLocale);
  },
  methods: {
-    initializeColorTheme() {
-      setColorTheme(window.matchMedia('(prefers-color-scheme: dark)').matches);
-    },
-    listenToThemeChanges() {
-      const mql = window.matchMedia('(prefers-color-scheme: dark)');
-      mql.onchange = e => setColorTheme(e.matches);
-    },
    setLocale(locale) {
      this.$root.$i18n.locale = locale;
    },
@@ -135,6 +115,11 @@ export default {

 <style lang="scss">
@import './assets/scss/app';
+.update-banner {
+  height: var(--space-larger);
+  align-items: center;
+  font-size: var(--font-size-small) !important;
+}
 </style>

 <style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
@@ -18,10 +18,6 @@ class CacheEnabledApiClient extends ApiClient {
      return this.getFromCache();
    }

-    return this.getFromNetwork();
-  }
-
-  getFromNetwork() {
    return axios.get(this.url);
  }

@@ -36,12 +32,7 @@ class CacheEnabledApiClient extends ApiClient {
  }

  async getFromCache() {
-    try {
-      // IDB is not supported in Firefox private mode: https://bugzilla.mozilla.org/show_bug.cgi?id=781982
-      await this.dataManager.initDb();
-    } catch {
-      return this.getFromNetwork();
-    }
+    await this.dataManager.initDb();

    const { data } = await axios.get(
      `/api/v1/accounts/${this.accountIdFromRoute}/cache_keys`
@@ -64,22 +55,16 @@ class CacheEnabledApiClient extends ApiClient {
  }

  async refetchAndCommit(newKey = null) {
-    const response = await this.getFromNetwork();
+    await this.dataManager.initDb();
+    const response = await axios.get(this.url);
+    this.dataManager.replace({
+      modelName: this.cacheModelName,
+      data: this.extractDataFromResponse(response),
+    });

-    try {
-      await this.dataManager.initDb();
-
-      this.dataManager.replace({
-        modelName: this.cacheModelName,
-        data: this.extractDataFromResponse(response),
-      });
-
-      await this.dataManager.setCacheKeys({
-        [this.cacheModelName]: newKey,
-      });
-    } catch {
-      // Ignore error
-    }
+    await this.dataManager.setCacheKeys({
+      [this.cacheModelName]: newKey,
+    });

    return response;
  }
@@ -1,16 +0,0 @@
-/* global axios */
-
-import ApiClient from './ApiClient';
-
-class AuditLogs extends ApiClient {
-  constructor() {
-    super('audit_logs', { accountScoped: true });
-  }
-
-  get({ page }) {
-    const url = page ? `${this.url}?page=${page}` : this.url;
-    return axios.get(url);
-  }
-}
-
-export default new AuditLogs();
@@ -3,11 +3,47 @@
 import Cookies from 'js-cookie';
 import endPoints from './endPoints';
 import {
+  setAuthCredentials,
  clearCookiesOnLogout,
  deleteIndexedDBOnLogout,
 } from '../store/utils/api';

 export default {
+  login(creds) {
+    return new Promise((resolve, reject) => {
+      axios
+        .post('auth/sign_in', creds)
+        .then(response => {
+          setAuthCredentials(response);
+          resolve(response.data);
+        })
+        .catch(error => {
+          reject(error.response);
+        });
+    });
+  },
+
+  register(creds) {
+    const urlData = endPoints('register');
+    const fetchPromise = new Promise((resolve, reject) => {
+      axios
+        .post(urlData.url, {
+          account_name: creds.accountName.trim(),
+          user_full_name: creds.fullName.trim(),
+          email: creds.email,
+          password: creds.password,
+          h_captcha_client_response: creds.hCaptchaClientResponse,
+        })
+        .then(response => {
+          setAuthCredentials(response);
+          resolve(response);
+        })
+        .catch(error => {
+          reject(error);
+        });
+    });
+    return fetchPromise;
+  },
  validityCheck() {
    const urlData = endPoints('validityCheck');
    return axios.get(urlData.url);
@@ -37,6 +73,45 @@ export default {
    }
    return false;
  },
+  verifyPasswordToken({ confirmationToken }) {
+    return new Promise((resolve, reject) => {
+      axios
+        .post('auth/confirmation', {
+          confirmation_token: confirmationToken,
+        })
+        .then(response => {
+          setAuthCredentials(response);
+          resolve(response);
+        })
+        .catch(error => {
+          reject(error.response);
+        });
+    });
+  },
+
+  setNewPassword({ resetPasswordToken, password, confirmPassword }) {
+    return new Promise((resolve, reject) => {
+      axios
+        .put('auth/password', {
+          reset_password_token: resetPasswordToken,
+          password_confirmation: confirmPassword,
+          password,
+        })
+        .then(response => {
+          setAuthCredentials(response);
+          resolve(response);
+        })
+        .catch(error => {
+          reject(error.response);
+        });
+    });
+  },
+
+  resetPassword({ email }) {
+    const urlData = endPoints('resetPassword');
+    return axios.post(urlData.url, { email });
+  },
+
  profileUpdate({
    password,
    password_confirmation,
@@ -9,6 +9,14 @@ class AutomationsAPI extends ApiClient {
  clone(automationId) {
    return axios.post(`${this.url}/${automationId}/clone`);
  }
+
+  attachment(file) {
+    return axios.post(`${this.url}/attach_file`, file, {
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+    });
+  }
 }

 export default new AutomationsAPI();
@@ -75,10 +75,6 @@ class ContactAPI extends ApiClient {
  destroyAvatar(contactId) {
    return axios.delete(`${this.url}/${contactId}/avatar`);
  }
-
-  exportContacts() {
-    return axios.get(`${this.url}/export`);
-  }
 }

 export default new ContactAPI();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shivam Mishra	29415571e9	fix: specs for labels and inboxes	2023-04-06 20:18:51 +05:30
Shivam Mishra	7b2e581cd3	fix: specs failing	2023-04-06 20:04:17 +05:30
@@ -1 +1 @@
 .5.1
 .17.4
@@ -1 +1 @@
 .2.2
 .1.3
@@ -1 +1 @@
 .17.0
 .2.0
@@ -1 +1 @@
 .3.0
 .1.0