feat(proposals): say how far a proposal has got, not just what it is waiting for
A row said "waiting for 2 of 3 members to take part" on the day a proposal was made and on the day before it completed. That is the rule, not the progress. Now it says "1 of 3 members have offered to sign", and on the next stage "2 of 3 signatures are in" -- the fractions that actually move. Nothing is counted once it has ended, which is both endings and not only the happy one. A signed session has nothing left to gather; an abandoned one has counts frozen where they stopped, and "2 of 3" beside a failure invites the reader to wait for a third that is never coming. The failure reason is what that row has to say. The denominators are the ones the protocol gates on. `orderedNonces` returns nothing until `threshold` nonces have arrived and then takes the first `threshold` of them, so the threshold is both what is needed and what is used -- the room's size is a bigger number nothing waits for. Once the signer set exists it is the set being waited on, which is the same count from the other side. The numerator is the part that had to be got right. A nonce or a partial signature is recorded with no check on who sent it, unlike a refusal, and `orderedNonces` drops the ones from members holding no share when it aggregates. So the tally joins `DkgParticipantMessage` on HOST_KEY and counts members rather than rows: a count including strangers would have a row read ahead of the coordinator, saying the group has what it needs while the session sits still. That is the one direction a progress figure must never be wrong in, and there is a DAO test for it. A count that still runs ahead -- a nonce landing before this device runs `advance` -- is clamped, because a fraction over one reads as a bug rather than as a session about to move. The counts travel as their own `GROUP BY` flow, combined with the sessions in the view model. They change far more often than the rows do, and carrying the messages themselves would carry every nonce payload the room has ever exchanged to a screen that only wants to count them. The progress is its own line rather than a clause, so a reader scanning for the one that is nearly there does not have to read a sentence to find out. That left `statusOf` saying only who the reader is in the proposal, and since this adds user-facing text its remaining literals moved to the catalogue with it -- nine strings that had been raw in the screen since before the catalogue rule. 1367 jvm tests pass, the Android target compiles, all audit budgets met. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
13ae0a1def
commit
7c6e9b0a84
12 files changed
+821
-28
No files matched your search
@@ -21,6 +21,7 @@
|
||||
"XML file ... is not valid. Check the file content."
|
||||
-->
|
||||
<string name="abandoned">Abandoned</string>
|
||||
<string name="abandoned_nothing_was_signed">Abandoned. Nothing was signed.</string>
|
||||
<string name="filter_all">All</string>
|
||||
<string name="app_name">Curare</string>
|
||||
<string name="add_a_dialect_the_group_can_translate_into">Add a dialect the group can translate into</string>
|
||||
@@ -91,6 +92,7 @@
|
||||
<string name="emergency_kit">Emergency kit</string>
|
||||
<string name="ended">ENDED</string>
|
||||
<string name="encrypt_and_back_your_recovery_information">Encrypt and back your recovery information up to your Google Drive or iCloud.</string>
|
||||
<string name="enough_members_took_part_without_you">Enough members took part without you.</string>
|
||||
<string name="enter_the_name_you_want_to_use_for_your">Enter the name you want to use for your group</string>
|
||||
<string name="enter_the_name_you_want_to_use_for_your_2">Enter the name you want to use for your profile</string>
|
||||
<string name="enter_the_translation_for_this_chunk">Enter the translation for this chunk</string>
|
||||
@@ -155,6 +157,7 @@
|
||||
<string name="name_eg_group_discussions">Name (eg. Group Discussions)</string>
|
||||
<string name="name_of_artifact">Name of artifact</string>
|
||||
<string name="needs_you">Needs you</string>
|
||||
<string name="needs_your_review">Needs your review.</string>
|
||||
<string name="network_relays">Network relays</string>
|
||||
<string name="no_proposal_is_being_signed">No proposal is being signed.</string>
|
||||
<string name="no_proposal_is_waiting_on_members">No proposal is waiting on members.</string>
|
||||
@@ -240,6 +243,7 @@
|
||||
<string name="the_signed_event">The signed event</string>
|
||||
<string name="copy_the_signed_event">Copy the signed event</string>
|
||||
<string name="copied_the_signed_event">Copied the signed event</string>
|
||||
<string name="signed_by_the_group">Signed by the group.</string>
|
||||
<string name="this_device_does_not_hold_the_event">This device holds the group's reading of this, but not the signed event itself. Nothing here can be checked against a signature.</string>
|
||||
<string name="sign">Sign</string>
|
||||
<string name="sign_in">Sign in</string>
|
||||
@@ -324,9 +328,12 @@
|
||||
<string name="write_down_and_secure_the_12_word_phrase">Write down and secure the 12 word phrase that this profile and its wallet are derived from.</string>
|
||||
<string name="who_will_you_be_passing_the_aux_to">Who will you be passing the aux to?</string>
|
||||
<string name="you">You</string>
|
||||
<string name="you_agreed">You agreed.</string>
|
||||
<string name="you_and_1_other">You and 1 other</string>
|
||||
<string name="you_are_about_to_create_a_nostr_profile">You are about to create a NOSTR profile.</string>
|
||||
<string name="you_are_signing">You are signing.</string>
|
||||
<string name="you_can_still_carry_on_and_invite_people">You can still carry on and invite people later.</string>
|
||||
<string name="you_declined">You declined.</string>
|
||||
<string name="you_have_not_backed_up_your_recovery_phrase">You have not backed up your recovery phrase</string>
|
||||
<string name="you_only_live_once_lose_this_phone_and_the">You only live once. Lose this phone and the profile goes with it, along with anything it holds.</string>
|
||||
<string name="you_said_you_wrote_it_down">You said you wrote it down</string>
|
||||
@@ -400,6 +407,8 @@
|
||||
<string name="anyone_in_this_group_can_run_a_subgroup">Anyone in this group can run a subgroup, whether or not they administer this one.</string>
|
||||
<string name="has_no_key_package_yet">Has no key package yet</string>
|
||||
<string name="admin_of_this_group">Admin of this group</string>
|
||||
<string name="of_members_have_offered_to_sign">%1$s of %2$s members have offered to sign</string>
|
||||
<string name="of_signatures_are_in">%1$s of %2$s signatures are in</string>
|
||||
<string name="you_coordinate_this_subgroup">You coordinate this subgroup</string>
|
||||
<string name="start_the_key_ceremony">Start the key ceremony</string>
|
||||
<string name="checking_who_can_be_added">Checking who can be added…</string>
|
||||
|
||||
Reference in new issue
Block a user