Skip to content

Add item emoji selection#92

Merged
barronlroth merged 6 commits into
mainfrom
codex/item-emoji-picker
May 23, 2026
Merged

Add item emoji selection#92
barronlroth merged 6 commits into
mainfrom
codex/item-emoji-picker

Conversation

@barronlroth

Copy link
Copy Markdown
Owner

Summary

  • Adds emoji selection to add/edit item forms using the existing item emoji field.
  • Uses MCEmojiPicker 1.2.5 via Swift Package Manager for the picker UI.
  • Persists manually selected emojis and prevents the AI emoji replacement path from overwriting them.
  • Bumps Cubby build number from 82 to 83 after ASC confirmed 1.0.7 build 82 is already uploaded and valid.

Validation

  • XcodeBuildMCP simulator build passed on iPhone 17 Pro.
  • CubbyTests passed: 173/173.
  • Verified ASC next build number for app 6751732388, version 1.0.7, platform IOS: 83.
  • Manually verified the picker opens from the edit item emoji field.

Release Notes

  • Build settings now use marketing version 1.0.7 and build 83 for this PR branch so Xcode Cloud/TestFlight upload does not reuse build 82.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b310abf440

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread Cubby/Views/Items/ItemEditView.swift Outdated
Comment on lines +323 to +324
emoji: selectedEmoji ?? EmojiPicker.emoji(for: item.id),
isPendingAiEmoji: selectedEmoji == initialEmoji ? initialIsPendingAiEmoji : false

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Avoid overwriting server-updated emoji on save

saveEdits always sends emoji/isPendingAiEmoji from the sheet’s initial local state, so saving unrelated fields can clobber newer values that arrived after the form loaded (e.g., the async AI emoji update or a collaborator’s CloudKit edit). In that case, this call rewrites the item back to the stale fallback emoji and can set isPendingAiEmoji back to true, effectively undoing a completed update. Before this commit, edit-save did not touch these fields, so this is a regression in concurrent-update scenarios.

Useful? React with 👍 / 👎.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7f72e6ef3c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.0.8;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Revert unintended app-version bump in project settings

This commit’s project settings move the app from the existing 1.0.7 train to 1.0.8 (and also advance build numbers), which changes release routing for TestFlight/App Store and can block the intended upload path that still expects 1.0.7 metadata. Because this PR is feature-scoped to emoji selection, carrying a marketing-version jump here is an operational regression and should be split out or reverted.

Useful? React with 👍 / 👎.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0c0b637f3a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +319 to +321
let savedIsPendingAiEmoji = didChangeEmoji
? false
: item.isPendingAiEmoji

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Prevent in-flight AI task from overwriting manual emoji

Setting isPendingAiEmoji to false here does not stop an already-started enhancement task from AppStore.createItem, so a user who manually picks an emoji shortly after creating an item can still have it overwritten when the async suggestion finishes. In EmojiAssignmentCoordinator.applyEmoji, the suggested emoji is written whenever it differs, regardless of the pending flag, so this new manual-selection flow regresses to nondeterministic final emoji under normal latency. Add cancellation or a pending/manual guard before applying the async result.

Useful? React with 👍 / 👎.

@barronlroth barronlroth merged commit 11e17a4 into main May 23, 2026
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant