From 8e602fb0ca079002160f975706ea007b7a55d681 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Tue, 30 Sep 2025 18:51:15 +0200 Subject: [PATCH 1/9] Introduce claude summarize plugin --- .buildkite/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index a91c9a4ced48..ceffe8d460ab 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -89,6 +89,8 @@ steps: - $TEST_COLLECTOR : <<: *test_collector_common_params api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_UNIT_TESTS" + - claude-summarize#v1.1.0: + api_key: "ANTHROPIC_API_KEY" artifact_paths: - "**/build/test-results/merged-test-results.xml" From 46baeacf707101fd4359417a48fdf113e02fb949 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Tue, 30 Sep 2025 18:56:20 +0200 Subject: [PATCH 2/9] temp: introduce regression --- .buildkite/pipeline.yml | 145 +++++++++--------- .../com/woocommerce/android/model/Address.kt | 2 +- 2 files changed, 74 insertions(+), 73 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index ceffe8d460ab..24ff83d441c6 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -12,71 +12,71 @@ agents: queue: "android" steps: - - label: Gradle Wrapper Validation - command: validate_gradle_wrapper - agents: - queue: linter +# - label: Gradle Wrapper Validation +# command: validate_gradle_wrapper +# agents: +# queue: linter # Wait for Gradle Wrapper to be validated before running any other jobs - - wait +# - wait ######################################## - - group: "🕵️ Linters" - steps: - - - label: "☢️ Danger - PR Check" - command: danger - key: danger - if: "build.pull_request.id != null" - retry: - manual: - permit_on_passed: true - agents: - queue: "linter" - - - label: "detekt" - command: | - if .buildkite/commands/should-skip-job.sh --job-type validation; then - exit 0 - fi - ./gradlew detektAll - plugins: [$CI_TOOLKIT] - artifact_paths: - - "**/build/reports/detekt/detekt.html" - - - label: "lint" - command: .buildkite/commands/lint.sh - plugins: [$CI_TOOLKIT] - artifact_paths: - - "**/build/reports/lint-results*.*" - - - label: "Dependency Tree Diff" - command: comment_with_dependency_diff 'woocommerce' 'vanillaReleaseRuntimeClasspath' - if: build.pull_request.id != null - plugins: [$CI_TOOLKIT] - artifact_paths: - - "**/build/reports/diff/*" - - - label: "Merged Manifest Diff" - command: ".buildkite/commands/diff-merged-manifest.sh vanillaRelease" - if: build.pull_request.id != null - plugins: [$CI_TOOLKIT] - artifact_paths: - - "**/build/reports/diff_manifest/**/**/*" +# - group: "🕵️ Linters" +# steps: +# +# - label: "☢️ Danger - PR Check" +# command: danger +# key: danger +# if: "build.pull_request.id != null" +# retry: +# manual: +# permit_on_passed: true +# agents: +# queue: "linter" +# +# - label: "detekt" +# command: | +# if .buildkite/commands/should-skip-job.sh --job-type validation; then +# exit 0 +# fi +# ./gradlew detektAll +# plugins: [$CI_TOOLKIT] +# artifact_paths: +# - "**/build/reports/detekt/detekt.html" +# +# - label: "lint" +# command: .buildkite/commands/lint.sh +# plugins: [$CI_TOOLKIT] +# artifact_paths: +# - "**/build/reports/lint-results*.*" +# +# - label: "Dependency Tree Diff" +# command: comment_with_dependency_diff 'woocommerce' 'vanillaReleaseRuntimeClasspath' +# if: build.pull_request.id != null +# plugins: [$CI_TOOLKIT] +# artifact_paths: +# - "**/build/reports/diff/*" +# +# - label: "Merged Manifest Diff" +# command: ".buildkite/commands/diff-merged-manifest.sh vanillaRelease" +# if: build.pull_request.id != null +# plugins: [$CI_TOOLKIT] +# artifact_paths: +# - "**/build/reports/diff_manifest/**/**/*" ######################################## - - group: "🛠 Prototype Builds" - steps: - - - label: "🛠 Prototype Build: Mobile App" - command: ".buildkite/commands/prototype-build.sh WooCommerce" - if: build.pull_request.id != null - plugins: [$CI_TOOLKIT] - - - label: "🛠 Prototype Build: Wear App" - command: ".buildkite/commands/prototype-build.sh WooCommerce-Wear" - if: build.pull_request.id != null - plugins: [$CI_TOOLKIT] +# - group: "🛠 Prototype Builds" +# steps: +# +# - label: "🛠 Prototype Build: Mobile App" +# command: ".buildkite/commands/prototype-build.sh WooCommerce" +# if: build.pull_request.id != null +# plugins: [$CI_TOOLKIT] +# +# - label: "🛠 Prototype Build: Wear App" +# command: ".buildkite/commands/prototype-build.sh WooCommerce-Wear" +# if: build.pull_request.id != null +# plugins: [$CI_TOOLKIT] ######################################## - group: "🔬 Tests" @@ -90,21 +90,22 @@ steps: <<: *test_collector_common_params api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_UNIT_TESTS" - claude-summarize#v1.1.0: - api_key: "ANTHROPIC_API_KEY" + api_key: "$ANTHROPIC_API_KEY" + buildkite_api_token: "$BUILDKITE_TOKEN_FOR_CLAUDE" artifact_paths: - "**/build/test-results/merged-test-results.xml" - - label: "Instrumented tests" - command: .buildkite/commands/run-instrumented-tests.sh - plugins: - - $CI_TOOLKIT - - $TEST_COLLECTOR : - <<: *test_collector_common_params - api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS" - artifact_paths: - - "**/build/instrumented-tests/**/*" +# - label: "Instrumented tests" +# command: .buildkite/commands/run-instrumented-tests.sh +# plugins: +# - $CI_TOOLKIT +# - $TEST_COLLECTOR : +# <<: *test_collector_common_params +# api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS" +# artifact_paths: +# - "**/build/instrumented-tests/**/*" - - label: "🐘 Populate Gradle build cache" - command: .buildkite/commands/gradle-cache-build.sh - plugins: [$CI_TOOLKIT] +# - label: "🐘 Populate Gradle build cache" +# command: .buildkite/commands/gradle-cache-build.sh +# plugins: [$CI_TOOLKIT] diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Address.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Address.kt index 9a3153952692..f00a0a70f715 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Address.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Address.kt @@ -81,7 +81,7 @@ data class Address( fun toShippingLabelModel(): ShippingLabelAddress { return ShippingLabelAddress( company = company, - name = "$firstName $lastName".trim().takeIf { it.isNotBlank() }, + name = "$firstName $lastName".trim().takeIf { it.isBlank() }, phone = phone, address = address1, address2 = address2, From 25ba80690a6f2a9832d8745b01e663b042c812c0 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Wed, 1 Oct 2025 14:30:01 +0200 Subject: [PATCH 3/9] Comment on PR if tests failed --- .buildkite/pipeline.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 24ff83d441c6..b050ceb83992 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -83,6 +83,7 @@ steps: steps: - label: "Unit tests" + key: unit-tests command: .buildkite/commands/run-unit-tests.sh plugins: - $CI_TOOLKIT @@ -95,6 +96,19 @@ steps: artifact_paths: - "**/build/test-results/merged-test-results.xml" + - label: "💬 Comment Claude Analysis" + command: | + # Check if unit tests failed (matches both hard_failed and soft_failed outcomes) + if buildkite-agent step get outcome --step unit-tests | grep -q "failed"; then + comment_on_pr \ + "## 🤖 Test Failure Analysis\n\nYour tests failed. Claude has analyzed the failures - [check the annotation](${BUILDKITE_BUILD_URL}/annotations#annotation-claude-analysis-${BUILDKITE_BUILD_ID}) for details." + fi + depends_on: unit-tests + allow_dependency_failure: true + if: build.pull_request.id != null + plugins: + - $CI_TOOLKIT + # - label: "Instrumented tests" # command: .buildkite/commands/run-instrumented-tests.sh # plugins: From 149c737ccf764f45c802802bb07e0751816b9fc9 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Wed, 1 Oct 2025 14:31:28 +0200 Subject: [PATCH 4/9] Remove comment if tests fixed --- .buildkite/pipeline.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index b050ceb83992..502c9fa7b1cd 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -100,8 +100,12 @@ steps: command: | # Check if unit tests failed (matches both hard_failed and soft_failed outcomes) if buildkite-agent step get outcome --step unit-tests | grep -q "failed"; then - comment_on_pr \ - "## 🤖 Test Failure Analysis\n\nYour tests failed. Claude has analyzed the failures - [check the annotation](${BUILDKITE_BUILD_URL}/annotations#annotation-claude-analysis-${BUILDKITE_BUILD_ID}) for details." + comment_on_pr --id claude-test-analysis "## 🤖 Test Failure Analysis + + Your tests failed. Claude has analyzed the failures - check the annotation for details." + else + # Remove the comment if tests are now passing + comment_on_pr --id claude-test-analysis --if-exist delete fi depends_on: unit-tests allow_dependency_failure: true From 6ab069188e92844ba94551603ef595bb18fb5972 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Wed, 1 Oct 2025 16:27:03 +0200 Subject: [PATCH 5/9] Try a post-command hook instead --- .buildkite/pipeline.yml | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 502c9fa7b1cd..fb65e8e13562 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -83,7 +83,6 @@ steps: steps: - label: "Unit tests" - key: unit-tests command: .buildkite/commands/run-unit-tests.sh plugins: - $CI_TOOLKIT @@ -93,26 +92,20 @@ steps: - claude-summarize#v1.1.0: api_key: "$ANTHROPIC_API_KEY" buildkite_api_token: "$BUILDKITE_TOKEN_FOR_CLAUDE" + - hooks#v1.3.1: + post-command: | + if [[ "${BUILDKITE_PULL_REQUEST}" != "false" ]]; then + if [[ "${BUILDKITE_COMMAND_EXIT_STATUS}" != "0" ]]; then + comment_on_pr --id claude-test-analysis "## 🤖 Test Failure Analysis + + Your tests failed. Claude has analyzed the failures - check the annotation for details." + else + comment_on_pr --id claude-test-analysis --if-exist delete + fi + fi artifact_paths: - "**/build/test-results/merged-test-results.xml" - - label: "💬 Comment Claude Analysis" - command: | - # Check if unit tests failed (matches both hard_failed and soft_failed outcomes) - if buildkite-agent step get outcome --step unit-tests | grep -q "failed"; then - comment_on_pr --id claude-test-analysis "## 🤖 Test Failure Analysis - - Your tests failed. Claude has analyzed the failures - check the annotation for details." - else - # Remove the comment if tests are now passing - comment_on_pr --id claude-test-analysis --if-exist delete - fi - depends_on: unit-tests - allow_dependency_failure: true - if: build.pull_request.id != null - plugins: - - $CI_TOOLKIT - # - label: "Instrumented tests" # command: .buildkite/commands/run-instrumented-tests.sh # plugins: From 1a0881d6f5affa840ecfe460e34ee13b6aa11ebf Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Mon, 6 Oct 2025 12:49:07 +0200 Subject: [PATCH 6/9] Revert "Try a post-command hook instead" This reverts commit 6ab069188e92844ba94551603ef595bb18fb5972. --- .buildkite/pipeline.yml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index fb65e8e13562..502c9fa7b1cd 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -83,6 +83,7 @@ steps: steps: - label: "Unit tests" + key: unit-tests command: .buildkite/commands/run-unit-tests.sh plugins: - $CI_TOOLKIT @@ -92,20 +93,26 @@ steps: - claude-summarize#v1.1.0: api_key: "$ANTHROPIC_API_KEY" buildkite_api_token: "$BUILDKITE_TOKEN_FOR_CLAUDE" - - hooks#v1.3.1: - post-command: | - if [[ "${BUILDKITE_PULL_REQUEST}" != "false" ]]; then - if [[ "${BUILDKITE_COMMAND_EXIT_STATUS}" != "0" ]]; then - comment_on_pr --id claude-test-analysis "## 🤖 Test Failure Analysis - - Your tests failed. Claude has analyzed the failures - check the annotation for details." - else - comment_on_pr --id claude-test-analysis --if-exist delete - fi - fi artifact_paths: - "**/build/test-results/merged-test-results.xml" + - label: "💬 Comment Claude Analysis" + command: | + # Check if unit tests failed (matches both hard_failed and soft_failed outcomes) + if buildkite-agent step get outcome --step unit-tests | grep -q "failed"; then + comment_on_pr --id claude-test-analysis "## 🤖 Test Failure Analysis + + Your tests failed. Claude has analyzed the failures - check the annotation for details." + else + # Remove the comment if tests are now passing + comment_on_pr --id claude-test-analysis --if-exist delete + fi + depends_on: unit-tests + allow_dependency_failure: true + if: build.pull_request.id != null + plugins: + - $CI_TOOLKIT + # - label: "Instrumented tests" # command: .buildkite/commands/run-instrumented-tests.sh # plugins: From a65c9295fae0d0781bcb70354b97653334a342d3 Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Mon, 6 Oct 2025 12:53:54 +0200 Subject: [PATCH 7/9] Extract comment claude command --- .buildkite/commands/comment-claude-analysis.sh | 11 +++++++++++ .buildkite/pipeline.yml | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) create mode 100755 .buildkite/commands/comment-claude-analysis.sh diff --git a/.buildkite/commands/comment-claude-analysis.sh b/.buildkite/commands/comment-claude-analysis.sh new file mode 100755 index 000000000000..3acf4fc2ac1f --- /dev/null +++ b/.buildkite/commands/comment-claude-analysis.sh @@ -0,0 +1,11 @@ +#!/bin/bash -eu + +# Check if unit tests failed (matches both hard_failed and soft_failed outcomes) +if buildkite-agent step get outcome --step unit-tests | grep -q "failed"; then + comment_on_pr --id claude-test-analysis "## 🤖 Test Failure Analysis + +Your tests failed. Claude has analyzed the failures - check the annotation for details." +else + # Remove the comment if tests are now passing + comment_on_pr --id claude-test-analysis --if-exist delete +fi diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 502c9fa7b1cd..b1295ce0a3d6 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -97,16 +97,7 @@ steps: - "**/build/test-results/merged-test-results.xml" - label: "💬 Comment Claude Analysis" - command: | - # Check if unit tests failed (matches both hard_failed and soft_failed outcomes) - if buildkite-agent step get outcome --step unit-tests | grep -q "failed"; then - comment_on_pr --id claude-test-analysis "## 🤖 Test Failure Analysis - - Your tests failed. Claude has analyzed the failures - check the annotation for details." - else - # Remove the comment if tests are now passing - comment_on_pr --id claude-test-analysis --if-exist delete - fi + command: .buildkite/commands/comment-claude-analysis.sh depends_on: unit-tests allow_dependency_failure: true if: build.pull_request.id != null From 6ae9a4661b8a162f5ea394328225e322c2915cae Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Mon, 6 Oct 2025 13:14:09 +0200 Subject: [PATCH 8/9] Uncomment rest of the steps, extract claude plugin version --- .buildkite/pipeline.yml | 144 ++++++++++++++++---------------- .buildkite/shared-pipeline-vars | 1 + 2 files changed, 73 insertions(+), 72 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index b1295ce0a3d6..95542dc5c8f2 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -12,71 +12,71 @@ agents: queue: "android" steps: -# - label: Gradle Wrapper Validation -# command: validate_gradle_wrapper -# agents: -# queue: linter + - label: Gradle Wrapper Validation + command: validate_gradle_wrapper + agents: + queue: linter # Wait for Gradle Wrapper to be validated before running any other jobs -# - wait + - wait ######################################## -# - group: "🕵️ Linters" -# steps: -# -# - label: "☢️ Danger - PR Check" -# command: danger -# key: danger -# if: "build.pull_request.id != null" -# retry: -# manual: -# permit_on_passed: true -# agents: -# queue: "linter" -# -# - label: "detekt" -# command: | -# if .buildkite/commands/should-skip-job.sh --job-type validation; then -# exit 0 -# fi -# ./gradlew detektAll -# plugins: [$CI_TOOLKIT] -# artifact_paths: -# - "**/build/reports/detekt/detekt.html" -# -# - label: "lint" -# command: .buildkite/commands/lint.sh -# plugins: [$CI_TOOLKIT] -# artifact_paths: -# - "**/build/reports/lint-results*.*" -# -# - label: "Dependency Tree Diff" -# command: comment_with_dependency_diff 'woocommerce' 'vanillaReleaseRuntimeClasspath' -# if: build.pull_request.id != null -# plugins: [$CI_TOOLKIT] -# artifact_paths: -# - "**/build/reports/diff/*" -# -# - label: "Merged Manifest Diff" -# command: ".buildkite/commands/diff-merged-manifest.sh vanillaRelease" -# if: build.pull_request.id != null -# plugins: [$CI_TOOLKIT] -# artifact_paths: -# - "**/build/reports/diff_manifest/**/**/*" + - group: "🕵️ Linters" + steps: + + - label: "☢️ Danger - PR Check" + command: danger + key: danger + if: "build.pull_request.id != null" + retry: + manual: + permit_on_passed: true + agents: + queue: "linter" + + - label: "detekt" + command: | + if .buildkite/commands/should-skip-job.sh --job-type validation; then + exit 0 + fi + ./gradlew detektAll + plugins: [$CI_TOOLKIT] + artifact_paths: + - "**/build/reports/detekt/detekt.html" + + - label: "lint" + command: .buildkite/commands/lint.sh + plugins: [$CI_TOOLKIT] + artifact_paths: + - "**/build/reports/lint-results*.*" + + - label: "Dependency Tree Diff" + command: comment_with_dependency_diff 'woocommerce' 'vanillaReleaseRuntimeClasspath' + if: build.pull_request.id != null + plugins: [$CI_TOOLKIT] + artifact_paths: + - "**/build/reports/diff/*" + + - label: "Merged Manifest Diff" + command: ".buildkite/commands/diff-merged-manifest.sh vanillaRelease" + if: build.pull_request.id != null + plugins: [$CI_TOOLKIT] + artifact_paths: + - "**/build/reports/diff_manifest/**/**/*" ######################################## -# - group: "🛠 Prototype Builds" -# steps: -# -# - label: "🛠 Prototype Build: Mobile App" -# command: ".buildkite/commands/prototype-build.sh WooCommerce" -# if: build.pull_request.id != null -# plugins: [$CI_TOOLKIT] -# -# - label: "🛠 Prototype Build: Wear App" -# command: ".buildkite/commands/prototype-build.sh WooCommerce-Wear" -# if: build.pull_request.id != null -# plugins: [$CI_TOOLKIT] + - group: "🛠 Prototype Builds" + steps: + + - label: "🛠 Prototype Build: Mobile App" + command: ".buildkite/commands/prototype-build.sh WooCommerce" + if: build.pull_request.id != null + plugins: [$CI_TOOLKIT] + + - label: "🛠 Prototype Build: Wear App" + command: ".buildkite/commands/prototype-build.sh WooCommerce-Wear" + if: build.pull_request.id != null + plugins: [$CI_TOOLKIT] ######################################## - group: "🔬 Tests" @@ -90,7 +90,7 @@ steps: - $TEST_COLLECTOR : <<: *test_collector_common_params api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_UNIT_TESTS" - - claude-summarize#v1.1.0: + - $CLAUDE_PLUGIN: api_key: "$ANTHROPIC_API_KEY" buildkite_api_token: "$BUILDKITE_TOKEN_FOR_CLAUDE" artifact_paths: @@ -104,17 +104,17 @@ steps: plugins: - $CI_TOOLKIT -# - label: "Instrumented tests" -# command: .buildkite/commands/run-instrumented-tests.sh -# plugins: -# - $CI_TOOLKIT -# - $TEST_COLLECTOR : -# <<: *test_collector_common_params -# api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS" -# artifact_paths: -# - "**/build/instrumented-tests/**/*" + - label: "Instrumented tests" + command: .buildkite/commands/run-instrumented-tests.sh + plugins: + - $CI_TOOLKIT + - $TEST_COLLECTOR : + <<: *test_collector_common_params + api-token-env-name: "BUILDKITE_ANALYTICS_TOKEN_INSTRUMENTED_TESTS" + artifact_paths: + - "**/build/instrumented-tests/**/*" -# - label: "🐘 Populate Gradle build cache" -# command: .buildkite/commands/gradle-cache-build.sh -# plugins: [$CI_TOOLKIT] + - label: "🐘 Populate Gradle build cache" + command: .buildkite/commands/gradle-cache-build.sh + plugins: [$CI_TOOLKIT] diff --git a/.buildkite/shared-pipeline-vars b/.buildkite/shared-pipeline-vars index 0b46446fba6d..08d9e22a5a23 100644 --- a/.buildkite/shared-pipeline-vars +++ b/.buildkite/shared-pipeline-vars @@ -5,3 +5,4 @@ export CI_TOOLKIT="automattic/a8c-ci-toolkit#5.4.0" export TEST_COLLECTOR="test-collector#v1.10.1" +export CLAUDE_PLUGIN="claude-summarize#v1.1.0" From 61e5dc2b9f91f814df6d0601c6ba8a029cbdfc3f Mon Sep 17 00:00:00 2001 From: Wojtek Zieba Date: Mon, 6 Oct 2025 19:19:22 +0200 Subject: [PATCH 9/9] Revert test regression --- .../src/main/kotlin/com/woocommerce/android/model/Address.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Address.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Address.kt index f00a0a70f715..9a3153952692 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Address.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/model/Address.kt @@ -81,7 +81,7 @@ data class Address( fun toShippingLabelModel(): ShippingLabelAddress { return ShippingLabelAddress( company = company, - name = "$firstName $lastName".trim().takeIf { it.isBlank() }, + name = "$firstName $lastName".trim().takeIf { it.isNotBlank() }, phone = phone, address = address1, address2 = address2,