this commit mirrors the 6.2.4 release

Author: alex-georgiou

adapters/class-bank-fiat-adapter.php

@@ -157,7 +157,7 @@ public function do_description_text(): void {
 	}
 
 	public function get_wallet_version(): string {
-		return '6.2.3';
+		return '6.2.4';
 	}
 
 	public function get_block_height( Currency $currency = null ): int {
@@ -449,7 +449,7 @@ function( string $subject, Transaction $tx ): string {
 							);
 						}
 
-						if ( ! ds_current_user_can( 'has_wallet' ) ) {
+						if ( ! ds_current_user_can( 'has_wallets' ) ) {
 							return new \WP_Error(
 								'user_without_wallet',
 								(string) __( 'Specified user not allowed to have wallets!', 'wallets' ),
@@ -682,7 +682,7 @@ function() {
 					'wallets-admin-deposit-tool',
 					get_asset_path( 'wallets-admin-deposit-tool' ),
 					[ 'jquery' ],
-					'6.2.3',
+					'6.2.4',
 					true
 				);
 			}

adapters/class-bitcoin-core-like-wallet-adapter.php

@@ -737,7 +737,7 @@ protected function rpc( string $method, ...$params ) {
 				$this->get_url( true ),
 				[
 					'timeout'     => absint( get_ds_option( 'wallets_http_timeout', 5 ) ),
-					'user-agent'  => 'Bitcoin and Altcoin Wallets version 6.2.3',
+					'user-agent'  => 'Bitcoin and Altcoin Wallets version 6.2.4',
 					'headers'     => [
 						'Accept-Encoding: gzip',
 						'Content-type: application/json',

admin/assets.php

@@ -21,7 +21,7 @@ function( $hook ) {
 				'wallets-admin-styles',
 				get_asset_path( 'wallets-admin', 'style' ),
 				[],
-				'6.2.3'
+				'6.2.4'
 			);
 
 			wp_register_script(
@@ -51,15 +51,15 @@ function( $hook ) {
 				'wallets-admin-menu-item',
 				get_asset_path( 'wallets-admin-menu-item' ),
 				[ 'jquery' ],
-				'6.2.3',
+				'6.2.4',
 				true
 			);
 
 			wp_register_script(
 				'wallets-admin-cs-tool',
 				get_asset_path( 'wallets-admin-cs-tool' ),
 				[ 'jquery-qrcode' ],
-				'6.2.3',
+				'6.2.4',
 				true
 			);
 
@@ -74,31 +74,31 @@ function( $hook ) {
 				'wallets-admin-capabilities',
 				get_asset_path( 'wallets-admin-capabilities' ),
 				[ 'jquery-ui-tabs' ],
-				'6.2.3',
+				'6.2.4',
 				true
 			);
 
 			wp_register_script(
 				'wallets-admin-dashboard',
 				get_asset_path( 'wallets-admin-dashboard' ),
 				[ 'jquery-ui-tabs', 'jqcloud' ],
-				'6.2.3',
+				'6.2.4',
 				true
 			);
 
 			wp_register_script(
 				'wallets-admin-docs',
 				get_asset_path( 'wallets-admin-docs' ),
 				[ 'jquery' ],
-				'6.2.3',
+				'6.2.4',
 				true
 			);
 
 			wp_register_script(
 				'wallets-admin-editor',
 				get_asset_path( 'wallets-admin-editor' ),
 				[ 'suggest' ],
-				'6.2.3',
+				'6.2.4',
 				true
 			);
 

admin/dashboard.php

@@ -348,8 +348,8 @@ function db_debug_cb() {
 	function( $debug_data ) {
 		global $wpdb;
 
-		$debug_data[ (string) __( 'Plugin version', 'wallets' ) ]         = '6.2.3';
-		$debug_data[ (string) __( 'Git SHA', 'wallets' ) ]                = '81fdc730';
+		$debug_data[ (string) __( 'Plugin version', 'wallets' ) ]         = '6.2.4';
+		$debug_data[ (string) __( 'Git SHA', 'wallets' ) ]                = 'aa58b70d';
 		$debug_data[ (string) __( 'Web Server', 'wallets' ) ]             = $_SERVER['SERVER_SOFTWARE'];
 		$debug_data[ (string) __( 'PHP version', 'wallets' ) ]            = PHP_VERSION;
 		$debug_data[ (string) __( 'WordPress version', 'wallets' ) ]      = (string) get_bloginfo( 'version' );

apis/wp-rest.php

@@ -124,10 +124,14 @@ function() {
 			[
 				'methods'  => \WP_REST_SERVER::READABLE,
 				'callback' => function( $data ) {
-					$currencies = get_all_currencies();
+					$currencies   = get_all_currencies();
+					$exclude_tags = explode(',',$data['exclude_tags'] );
 					$result     = [];
 
 					foreach ( $currencies as $currency ) {
+						if ( array_intersect( $currency->tags, $exclude_tags ) ) {
+							continue;
+						}
 
 						$rates = [];
 						$vs_currencies = get_ds_option( 'wallets_rates_vs', [] );
@@ -268,6 +272,7 @@ function() {
 						'is_fiat'           => $currency->is_fiat(),
 						'is_online'         => $currency->is_online(),
 						'block_height'      => $block_height,
+						'tags'              => $currency->tags,
 					];
 
 					$max_age = max( 0, absint( get_ds_option( 'wallets_polling_interval', 0 ) ) - 1 );
@@ -286,8 +291,9 @@ function() {
 			[
 				'methods'  => \WP_REST_SERVER::READABLE,
 				'callback' => function( $data ) {
-					$params  = $data->get_url_params();
-					$user_id = $params['user_id'];
+					$params       = $data->get_url_params();
+					$user_id      = $params['user_id'];
+					$exclude_tags = explode(',',$data['exclude_tags'] );
 
 					$currencies           = get_all_currencies();
 					$balances             = get_all_balances_assoc_for_user( $user_id );
@@ -297,6 +303,10 @@ function() {
 
 					foreach ( $currencies as $currency ) {
 
+						if ( array_intersect( $currency->tags, $exclude_tags ) ) {
+							continue;
+						}
+
 						$rates = [];
 						$vs_currencies = get_ds_option( 'wallets_rates_vs', [] );
 						if ( $vs_currencies && is_array( $vs_currencies ) ) {
@@ -350,8 +360,17 @@ function() {
 					'user_id' => [
 						'sanitize_callback' => 'absint',
 					],
-
-				],
+					'exclude_tags' => [
+						'required' => false,
+						'validate_callback' => function( $param, $request, $key ) {
+							foreach ( explode( ',', $param ) as $slug ) {
+								if ( ! preg_match( '/^[a-z0-9]+(?:-[a-z0-9]+)*$/', $slug ) ) {
+									return false;
+								}
+							}
+							return true;
+						}
+					],				],
 				'permission_callback' => $permission_callback,
 			]
 		);
@@ -424,7 +443,6 @@ function() {
 					'user_id' => [
 						'sanitize_callback' => 'absint',
 					],
-
 				],
 				'permission_callback' => $permission_callback,
 			]