diff --git a/app/controllers/api/v1/accounts/whatsapp/manual_setup_controller.rb b/app/controllers/api/v1/accounts/whatsapp/manual_setup_controller.rb index b8c225017..5ae1c05ed 100644 --- a/app/controllers/api/v1/accounts/whatsapp/manual_setup_controller.rb +++ b/app/controllers/api/v1/accounts/whatsapp/manual_setup_controller.rb @@ -66,7 +66,6 @@ class Api::V1::Accounts::Whatsapp::ManualSetupController < Api::V1::Accounts::Ba number_access: true, template_access: true, webhook_setup: setup.webhook_setup?, - webhook_verified: channel.webhook_verified_at.present?, webhook_error: setup.webhook_error } end diff --git a/app/controllers/concerns/meta_token_verify_concern.rb b/app/controllers/concerns/meta_token_verify_concern.rb index eb20ecdca..42fe918cc 100644 --- a/app/controllers/concerns/meta_token_verify_concern.rb +++ b/app/controllers/concerns/meta_token_verify_concern.rb @@ -9,7 +9,6 @@ module MetaTokenVerifyConcern def verify service = is_a?(Webhooks::WhatsappController) ? 'whatsapp' : 'instagram' if valid_token?(params['hub.verify_token']) - mark_webhook_verified if respond_to?(:mark_webhook_verified, true) Rails.logger.info("#{service.capitalize} webhook verified") render json: params['hub.challenge'] else diff --git a/app/controllers/webhooks/whatsapp_controller.rb b/app/controllers/webhooks/whatsapp_controller.rb index eecc0dac3..ee71f3c92 100644 --- a/app/controllers/webhooks/whatsapp_controller.rb +++ b/app/controllers/webhooks/whatsapp_controller.rb @@ -22,14 +22,6 @@ class Webhooks::WhatsappController < ActionController::API token == whatsapp_webhook_verify_token if whatsapp_webhook_verify_token.present? end - def mark_webhook_verified - channel = Channel::Whatsapp.find_by(phone_number: params[:phone_number]) - # The verification callback must not trigger remote provider validation. - # rubocop:disable Rails/SkipsModelValidations - channel&.update_column(:webhook_verified_at, Time.current) - # rubocop:enable Rails/SkipsModelValidations - end - def meta_app_secrets [ *channel_meta_app_secrets(whatsapp_channel), diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json index 779d8710e..c48b8743c 100644 --- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json +++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json @@ -304,7 +304,7 @@ "1": { "LABEL": "Create Meta app" }, "2": { "LABEL": "Add phone number and get IDs" }, "3": { "LABEL": "Generate access token" }, - "4": { "LABEL": "Review and connect" }, + "4": { "LABEL": "Create inbox" }, "5": { "LABEL": "Verify connection" } }, "APP": { @@ -346,18 +346,15 @@ "DETAILS": { "WABA_LABEL": "WhatsApp Business Account ID", "WABA_PLACEHOLDER": "Enter WABA ID", - "WABA_HELP": "Copy this from the API Setup page in your Meta app.", "PHONE_ID_LABEL": "Phone Number ID", "PHONE_ID_PLACEHOLDER": "Enter Phone Number ID", - "PHONE_ID_HELP": "Copy the ID shown beside your production phone number in Meta.", "TOKEN_LABEL": "Permanent access token", - "TOKEN_PLACEHOLDER": "Paste access token", - "TOKEN_HELP": "Use a permanent system-user token with WhatsApp messaging and management permissions." + "TOKEN_PLACEHOLDER": "Paste access token" }, "REVIEW": { - "TITLE": "Review and connect your number", - "DESCRIPTION": "These details were retrieved directly from Meta.", - "VERIFIED": "The number and token were verified with Meta.", + "TITLE": "Create your WhatsApp inbox", + "DESCRIPTION": "Review the number details and choose a name for the inbox.", + "VERIFIED": "Your Meta number and access token are valid.", "BUSINESS_NAME": "Business name", "PHONE_NUMBER": "Phone number", "PHONE_ID": "Phone Number ID", @@ -389,7 +386,7 @@ "SHOW_TOKEN": "Show token", "HIDE_TOKEN": "Hide token", "VERIFY_DETAILS": "Verify details", - "CONNECT": "Connect number", + "CONNECT": "Create inbox", "RETRY_WEBHOOK": "Retry webhook setup", "CONTINUE": "Continue to add agents" }, diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappManualSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappManualSetup.vue index 64ec0126a..d95143d79 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappManualSetup.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/WhatsappManualSetup.vue @@ -1,5 +1,5 @@