Merge branch 'develop' into ari/auto-register-if-branded

Author: aristath

CHANGELOG.md

@@ -1,3 +1,10 @@
+= 1.9.0 =
+
+Bugs we fixed:
+
+* Fix missing content and streak badges after they are all completed.
+
+
 = 1.8.0 =
 
 Enhancements:

classes/admin/widgets/class-badge-streak.php

@@ -37,7 +37,7 @@ public function get_details( $context ) {
 		// Get the badge to display.
 		foreach ( $badges as $badge ) {
 			$progress = $badge->get_progress();
-			if ( 100 > $progress['progress'] ) {
+			if ( 100 >= $progress['progress'] ) {
 				$result[ $context ] = $badge;
 				break;
 			}

classes/ui/class-branding.php

@@ -18,8 +18,7 @@ final class Branding {
 	 * @var array<string, int>
 	 */
 	const BRANDING_IDS = [
-		// TODO: Change this to the default value of 0.
-		'default' => 5159,
+		'default' => 0,
 	];
 
 	/**